diff --git a/app/Console/Commands/UpgradeDatabase.php b/app/Console/Commands/UpgradeDatabase.php
index 4d3633289f..2b21ed83fc 100644
--- a/app/Console/Commands/UpgradeDatabase.php
+++ b/app/Console/Commands/UpgradeDatabase.php
@@ -72,8 +72,7 @@ class UpgradeDatabase extends Command
         }
 
 
-        $subQuery = TransactionJournal
-            ::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+        $subQuery = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
             ->whereNull('transaction_journals.deleted_at')
             ->whereNull('transactions.deleted_at')
             ->groupBy(['transaction_journals.id'])
@@ -98,8 +97,7 @@ class UpgradeDatabase extends Command
 
                 try {
                     /** @var Transaction $opposing */
-                    $opposing = Transaction
-                        ::where('transaction_journal_id', $journalId)
+                    $opposing = Transaction::where('transaction_journal_id', $journalId)
                         ->where('amount', $amount)->where('identifier', '=', 0)
                         ->whereNotIn('id', $processed)
                         ->first();
diff --git a/app/Console/Commands/VerifyDatabase.php b/app/Console/Commands/VerifyDatabase.php
index d2ca7a3454..d9c6d7c086 100644
--- a/app/Console/Commands/VerifyDatabase.php
+++ b/app/Console/Commands/VerifyDatabase.php
@@ -102,8 +102,7 @@ class VerifyDatabase extends Command
      */
     private function reportAccounts()
     {
-        $set = Account
-            ::leftJoin('transactions', 'transactions.account_id', '=', 'accounts.id')
+        $set = Account::leftJoin('transactions', 'transactions.account_id', '=', 'accounts.id')
             ->leftJoin('users', 'accounts.user_id', '=', 'users.id')
             ->groupBy(['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email'])
             ->whereNull('transactions.account_id')
@@ -125,8 +124,7 @@ class VerifyDatabase extends Command
      */
     private function reportBudgetLimits()
     {
-        $set = Budget
-            ::leftJoin('budget_limits', 'budget_limits.budget_id', '=', 'budgets.id')
+        $set = Budget::leftJoin('budget_limits', 'budget_limits.budget_id', '=', 'budgets.id')
             ->leftJoin('users', 'budgets.user_id', '=', 'users.id')
             ->groupBy(['budgets.id', 'budgets.name', 'budgets.user_id', 'users.email'])
             ->whereNull('budget_limits.id')
@@ -148,8 +146,7 @@ class VerifyDatabase extends Command
      */
     private function reportDeletedAccounts()
     {
-        $set = Account
-            ::leftJoin('transactions', 'transactions.account_id', '=', 'accounts.id')
+        $set = Account::leftJoin('transactions', 'transactions.account_id', '=', 'accounts.id')
             ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
             ->whereNotNull('accounts.deleted_at')
             ->whereNotNull('transactions.id')
@@ -187,8 +184,7 @@ class VerifyDatabase extends Command
             TransactionType::TRANSFER   => [AccountType::EXPENSE, AccountType::REVENUE],
         ];
         foreach ($configuration as $transactionType => $accountTypes) {
-            $set = TransactionJournal
-                ::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
+            $set = TransactionJournal::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
                 ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
                 ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
                 ->leftJoin('account_types', 'account_types.id', 'accounts.account_type_id')
@@ -218,8 +214,7 @@ class VerifyDatabase extends Command
      */
     private function reportJournals()
     {
-        $set = TransactionJournal
-            ::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+        $set = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
             ->whereNotNull('transaction_journals.deleted_at')// USE THIS
             ->whereNull('transactions.deleted_at')
             ->whereNotNull('transactions.id')
@@ -245,8 +240,7 @@ class VerifyDatabase extends Command
      */
     private function reportNoTransactions()
     {
-        $set = TransactionJournal
-            ::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+        $set = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
             ->groupBy('transaction_journals.id')
             ->whereNull('transactions.transaction_journal_id')
             ->get(['transaction_journals.id']);
diff --git a/app/Export/Collector/JournalExportCollector.php b/app/Export/Collector/JournalExportCollector.php
index b9bd7fe0ed..a3e97c957f 100644
--- a/app/Export/Collector/JournalExportCollector.php
+++ b/app/Export/Collector/JournalExportCollector.php
@@ -292,8 +292,7 @@ class JournalExportCollector extends BasicCollector implements CollectorInterfac
     private function getWorkSet()
     {
         $accountIds    = $this->accounts->pluck('id')->toArray();
-        $this->workSet = Transaction
-            ::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
+        $this->workSet = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
             ->leftJoin(
                 'transactions AS opposing', function (JoinClause $join) {
                 $join->on('opposing.transaction_journal_id', '=', 'transactions.transaction_journal_id')
diff --git a/app/Helpers/Collector/JournalCollector.php b/app/Helpers/Collector/JournalCollector.php
index 677a7b4f66..328f4ca53f 100644
--- a/app/Helpers/Collector/JournalCollector.php
+++ b/app/Helpers/Collector/JournalCollector.php
@@ -621,8 +621,7 @@ class JournalCollector implements JournalCollectorInterface
     private function startQuery(): EloquentBuilder
     {
 
-        $query = Transaction
-            ::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
+        $query = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
             ->leftJoin('transaction_currencies', 'transaction_currencies.id', 'transaction_journals.transaction_currency_id')
             ->leftJoin('transaction_types', 'transaction_types.id', 'transaction_journals.transaction_type_id')
             ->leftJoin('bills', 'bills.id', 'transaction_journals.bill_id')
diff --git a/app/Models/Account.php b/app/Models/Account.php
index 43547de497..580ace8509 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -199,8 +199,7 @@ class Account extends Model
      */
     public function getOpeningBalanceAmount(): string
     {
-        $journal = TransactionJournal
-            ::sortCorrectly()
+        $journal = TransactionJournal::sortCorrectly()
             ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
             ->where('transactions.account_id', $this->id)
             ->transactionTypes([TransactionType::OPENING_BALANCE])
@@ -230,8 +229,7 @@ class Account extends Model
     public function getOpeningBalanceDate(): Carbon
     {
         $date    = new Carbon('1900-01-01');
-        $journal = TransactionJournal
-            ::sortCorrectly()
+        $journal = TransactionJournal::sortCorrectly()
             ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
             ->where('transactions.account_id', $this->id)
             ->transactionTypes([TransactionType::OPENING_BALANCE])
diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php
index f76f8bcdcf..f9a8c206e9 100644
--- a/app/Models/TransactionJournal.php
+++ b/app/Models/TransactionJournal.php
@@ -64,8 +64,7 @@ class TransactionJournal extends TransactionJournalSupport
     public static function routeBinder($value)
     {
         if (auth()->check()) {
-            $object = TransactionJournal
-                ::where('transaction_journals.id', $value)
+            $object = TransactionJournal::where('transaction_journals.id', $value)
                 ->with('transactionType')
                 ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
                 ->where('user_id', auth()->user()->id)->first(['transaction_journals.*']);
diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php
index 65f21055b2..ecdafaf1b8 100644
--- a/app/Repositories/Account/AccountRepository.php
+++ b/app/Repositories/Account/AccountRepository.php
@@ -367,8 +367,7 @@ class AccountRepository implements AccountRepositoryInterface
      */
     protected function openingBalanceTransaction(Account $account): TransactionJournal
     {
-        $journal = TransactionJournal
-            ::sortCorrectly()
+        $journal = TransactionJournal::sortCorrectly()
             ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
             ->where('transactions.account_id', $account->id)
             ->transactionTypes([TransactionType::OPENING_BALANCE])
diff --git a/app/Repositories/Account/AccountTasker.php b/app/Repositories/Account/AccountTasker.php
index f26b61a0d2..efcff148de 100644
--- a/app/Repositories/Account/AccountTasker.php
+++ b/app/Repositories/Account/AccountTasker.php
@@ -249,8 +249,7 @@ class AccountTasker implements AccountTaskerInterface
         $joinModifier = $incoming ? '<' : '>';
         $selection    = $incoming ? '>' : '<';
 
-        $query = Transaction
-            ::distinct()
+        $query = Transaction::distinct()
             ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
             ->leftJoin(
                 'transactions as other_side', function (JoinClause $join) use ($joinModifier) {
@@ -302,8 +301,7 @@ class AccountTasker implements AccountTaskerInterface
         $collection   = new Collection;
         $joinModifier = $incoming ? '<' : '>';
         $selection    = $incoming ? '>' : '<';
-        $query        = Transaction
-            ::distinct()
+        $query        = Transaction::distinct()
             ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
             ->leftJoin('transaction_types', 'transaction_journals.transaction_type_id', '=', 'transaction_types.id')
             ->leftJoin(
diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php
index 354c730011..c2db7da39a 100644
--- a/app/Repositories/Budget/BudgetRepository.php
+++ b/app/Repositories/Budget/BudgetRepository.php
@@ -332,8 +332,7 @@ class BudgetRepository implements BudgetRepositoryInterface
         Log::debug('spentInPeriod: and these accounts: ', $accountIds);
         Log::debug(sprintf('spentInPeriod: Start date is "%s", end date is "%s"', $start->format('Y-m-d'), $end->format('Y-m-d')));
 
-        $fromJournalsQuery = TransactionJournal
-            ::leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
+        $fromJournalsQuery = TransactionJournal::leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
             ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
             ->leftJoin(
                 'transactions', function (JoinClause $join) {
@@ -368,8 +367,7 @@ class BudgetRepository implements BudgetRepositoryInterface
          * and budget_transaction.budget_id in (1,61)
          * and transactions.account_id in (2)
          */
-        $fromTransactionsQuery = Transaction
-            ::leftJoin('budget_transaction', 'budget_transaction.transaction_id', '=', 'transactions.id')
+        $fromTransactionsQuery = Transaction::leftJoin('budget_transaction', 'budget_transaction.transaction_id', '=', 'transactions.id')
             ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
             ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
             ->whereNull('transactions.deleted_at')
diff --git a/app/Repositories/Journal/JournalTasker.php b/app/Repositories/Journal/JournalTasker.php
index d717fdbda5..90e3edbd75 100644
--- a/app/Repositories/Journal/JournalTasker.php
+++ b/app/Repositories/Journal/JournalTasker.php
@@ -171,9 +171,7 @@ class JournalTasker implements JournalTaskerInterface
         $identifier  = intval($transaction->identifier);
 
         // go!
-        $sum
-            = Transaction
-            ::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
+        $sum = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
             ->where('account_id', $transaction->account_id)
             ->whereNull('transactions.deleted_at')
             ->whereNull('transaction_journals.deleted_at')
diff --git a/app/Repositories/User/UserRepository.php b/app/Repositories/User/UserRepository.php
index f7b76eb1d9..e3fa94480a 100644
--- a/app/Repositories/User/UserRepository.php
+++ b/app/Repositories/User/UserRepository.php
@@ -113,8 +113,7 @@ class UserRepository implements UserRepositoryInterface
         $return['bills']               = $user->bills()->count();
         $return['categories']          = $user->categories()->count();
         $return['budgets']             = $user->budgets()->count();
-        $return['budgets_with_limits'] = BudgetLimit
-            ::distinct()
+        $return['budgets_with_limits'] = BudgetLimit::distinct()
             ->leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id')
             ->where('amount', '>', 0)
             ->whereNull('budgets.deleted_at')
diff --git a/app/Support/Twig/Transaction.php b/app/Support/Twig/Transaction.php
index 37a964e959..ef05c214ad 100644
--- a/app/Support/Twig/Transaction.php
+++ b/app/Support/Twig/Transaction.php
@@ -109,8 +109,7 @@ class Transaction extends Twig_Extension
             'optionalJournalAmount', function (int $journalId, string $transactionAmount, string $code, string $type): string {
 
             $amount = strval(
-                TransactionModel
-                    ::where('transaction_journal_id', $journalId)
+                TransactionModel::where('transaction_journal_id', $journalId)
                     ->whereNull('deleted_at')
                     ->where('amount', '<', 0)
                     ->sum('amount')
@@ -204,8 +203,7 @@ class Transaction extends Twig_Extension
                 // if the amount is negative, find the opposing account and use that one:
                 $journalId = $transaction->journal_id;
                 /** @var TransactionModel $other */
-                $other = TransactionModel
-                    ::where('transaction_journal_id', $journalId)->where('transactions.id', '!=', $transaction->id)
+                $other = TransactionModel::where('transaction_journal_id', $journalId)->where('transactions.id', '!=', $transaction->id)
                     ->where('amount', '=', bcmul($transaction->transaction_amount, '-1'))->where('identifier', $transaction->identifier)
                     ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
                     ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
@@ -278,8 +276,7 @@ class Transaction extends Twig_Extension
             if (bccomp($transaction->transaction_amount, '0') === 1 && is_null($transaction->opposing_account_id)) {
                 $journalId = $transaction->journal_id;
                 /** @var TransactionModel $other */
-                $other = TransactionModel
-                    ::where('transaction_journal_id', $journalId)->where('transactions.id', '!=', $transaction->id)
+                $other = TransactionModel::where('transaction_journal_id', $journalId)->where('transactions.id', '!=', $transaction->id)
                     ->where('amount', '=', bcmul($transaction->transaction_amount, '-1'))->where('identifier', $transaction->identifier)
                     ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
                     ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')