diff --git a/app/Helpers/Attachments/AttachmentHelperInterface.php b/app/Helpers/Attachments/AttachmentHelperInterface.php
index 8432df216f..aeb718ae11 100644
--- a/app/Helpers/Attachments/AttachmentHelperInterface.php
+++ b/app/Helpers/Attachments/AttachmentHelperInterface.php
@@ -9,7 +9,8 @@
  * See the LICENSE file for details.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
+
 namespace FireflyIII\Helpers\Attachments;
 
 use FireflyIII\Models\Attachment;
@@ -42,7 +43,7 @@ interface AttachmentHelperInterface
     public function getMessages(): MessageBag;
 
     /**
-     * @param Model $model
+     * @param Model      $model
      *
      * @param null|array $files
      *
diff --git a/app/Helpers/Help/Help.php b/app/Helpers/Help/Help.php
index ac76a3beab..c7c97bcb96 100644
--- a/app/Helpers/Help/Help.php
+++ b/app/Helpers/Help/Help.php
@@ -9,7 +9,8 @@
  * See the LICENSE file for details.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
+
 namespace FireflyIII\Helpers\Help;
 
 use Cache;
@@ -123,6 +124,7 @@ class Help implements HelpInterface
         if (strlen($content) > 0) {
             Log::debug(sprintf('Will store entry in cache: %s', $key));
             Cache::put($key, $content, 10080); // a week.
+
             return;
         }
         Log::info(sprintf('Will not cache %s because content is empty.', $key));
diff --git a/app/Http/Controllers/ImportController.php b/app/Http/Controllers/ImportController.php
index 9059c840dd..a1d04f01a1 100644
--- a/app/Http/Controllers/ImportController.php
+++ b/app/Http/Controllers/ImportController.php
@@ -8,7 +8,7 @@
  *
  * See the LICENSE file for details.
  */
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers;
 
@@ -347,7 +347,7 @@ class ImportController extends Controller
      *
      * @param ImportUploadRequest          $request
      * @param ImportJobRepositoryInterface $repository
-     * @param UserRepositoryInterface $userRepository
+     * @param UserRepositoryInterface      $userRepository
      *
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
@@ -368,7 +368,7 @@ class ImportController extends Controller
         $disk             = Storage::disk('upload');
 
         // user is demo user, replace upload with prepared file.
-        if ($userRepository->hasRole(auth()->user(),'demo')) {
+        if ($userRepository->hasRole(auth()->user(), 'demo')) {
             $stubsDisk        = Storage::disk('stubs');
             $content          = $stubsDisk->get('demo-import.csv');
             $contentEncrypted = Crypt::encrypt($content);
@@ -376,14 +376,14 @@ class ImportController extends Controller
             Log::debug('Replaced upload with demo file.');
 
             // also set up prepared configuration.
-            $configuration      = json_decode($stubsDisk->get('demo-configuration.json'), true);
+            $configuration = json_decode($stubsDisk->get('demo-configuration.json'), true);
             $repository->setConfiguration($job, $configuration);
             Log::debug('Set configuration for demo user', $configuration);
 
             // also flash info
             Session::flash('info', trans('demo.import-configure-security'));
         }
-        if (!$userRepository->hasRole(auth()->user(),'demo')) {
+        if (!$userRepository->hasRole(auth()->user(), 'demo')) {
             // user is not demo, process original upload:
             $disk->put($newName, $contentEncrypted);
             Log::debug('Uploaded file', ['name' => $upload->getClientOriginalName(), 'size' => $upload->getSize(), 'mime' => $upload->getClientMimeType()]);
@@ -410,6 +410,7 @@ class ImportController extends Controller
             }
             // @codeCoverageIgnoreEnd
         }
+
         return redirect(route('import.configure', [$job->key]));
     }
 
@@ -429,6 +430,7 @@ class ImportController extends Controller
             case 'settings':
             case 'store-settings':
                 Log::debug(sprintf('Job %d with key %s has status %s', $job->id, $job->key, $job->status));
+
                 return $job->status === 'import_configuration_saved';
             case 'finished':
                 return $job->status === 'import_complete';
diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php
index becfd42819..f1c40e2637 100644
--- a/app/Http/Controllers/PreferencesController.php
+++ b/app/Http/Controllers/PreferencesController.php
@@ -18,7 +18,6 @@ use FireflyIII\Models\AccountType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use Illuminate\Http\Request;
-use Log;
 use PragmaRX\Google2FA\Contracts\Google2FA;
 use Preferences;
 use Session;
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index 92fd5c98cd..928877af74 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -9,12 +9,11 @@
  * See the LICENSE file for details.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers;
 
 use Carbon\Carbon;
-use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Generator\Report\ReportGeneratorFactory;
 use FireflyIII\Helpers\Report\ReportHelperInterface;
 use FireflyIII\Http\Requests\ReportFormRequest;
diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php
index 60461e1c53..a7247b7705 100644
--- a/app/Http/Controllers/RuleController.php
+++ b/app/Http/Controllers/RuleController.php
@@ -475,7 +475,7 @@ class RuleController extends Controller
             $actions[] = view(
                 'rules.partials.action',
                 [
-                    'oldAction' => $entry,
+                    'oldAction'  => $entry,
                     'oldValue'   => $request->old('rule-action-value')[$index],
                     'oldChecked' => $checked,
                     'count'      => $count,
diff --git a/app/Http/Requests/BillFormRequest.php b/app/Http/Requests/BillFormRequest.php
index 992542eca1..1dbe2d707b 100644
--- a/app/Http/Requests/BillFormRequest.php
+++ b/app/Http/Requests/BillFormRequest.php
@@ -9,7 +9,7 @@
  * See the LICENSE file for details.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace FireflyIII\Http\Requests;
 
@@ -58,7 +58,7 @@ class BillFormRequest extends Request
         $nameRule  = 'required|between:1,255|uniqueObjectForUser:bills,name';
         $matchRule = 'required|between:1,255|uniqueObjectForUser:bills,match';
         if (intval($this->get('id')) > 0) {
-            $nameRule .= ',' . intval($this->get('id'));
+            $nameRule  .= ',' . intval($this->get('id'));
             $matchRule .= ',' . intval($this->get('id'));
         }
 
diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php
index a740586ea4..72f24920d6 100644
--- a/app/Http/breadcrumbs.php
+++ b/app/Http/breadcrumbs.php
@@ -9,7 +9,7 @@
  * See the LICENSE file for details.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 use Carbon\Carbon;
 use DaveJamesMiller\Breadcrumbs\Generator as BreadCrumbGenerator;
 use FireflyIII\Exceptions\FireflyException;
@@ -79,8 +79,9 @@ Breadcrumbs::register(
     }
     // when is specific period:
     if (strlen($moment) > 0 && $moment !== 'all') {
-        $title = trans('firefly.between_dates_breadcrumb', ['start' => $start->formatLocalized(strval(trans('config.month_and_day'))),
-                                                            'end'   => $end->formatLocalized(strval(trans('config.month_and_day')))]
+        $title = trans(
+            'firefly.between_dates_breadcrumb', ['start' => $start->formatLocalized(strval(trans('config.month_and_day'))),
+                                                 'end'   => $end->formatLocalized(strval(trans('config.month_and_day')))]
         );
         $breadcrumbs->push($title, route('accounts.show', [$account->id, $moment]));
     }
@@ -333,8 +334,9 @@ Breadcrumbs::register(
     }
     // when is specific period:
     if (strlen($moment) > 0 && $moment !== 'all') {
-        $title = trans('firefly.between_dates_breadcrumb', ['start' => $start->formatLocalized(strval(trans('config.month_and_day'))),
-                                                            'end'   => $end->formatLocalized(strval(trans('config.month_and_day')))]
+        $title = trans(
+            'firefly.between_dates_breadcrumb', ['start' => $start->formatLocalized(strval(trans('config.month_and_day'))),
+                                                 'end'   => $end->formatLocalized(strval(trans('config.month_and_day')))]
         );
         $breadcrumbs->push($title, route('categories.show', [$category->id, $moment]));
     }
@@ -742,8 +744,9 @@ Breadcrumbs::register(
 
     // when is specific period:
     if (strlen($moment) > 0 && $moment !== 'all') {
-        $title = trans('firefly.between_dates_breadcrumb', ['start' => $start->formatLocalized(strval(trans('config.month_and_day'))),
-                                                            'end'   => $end->formatLocalized(strval(trans('config.month_and_day')))]
+        $title = trans(
+            'firefly.between_dates_breadcrumb', ['start' => $start->formatLocalized(strval(trans('config.month_and_day'))),
+                                                 'end'   => $end->formatLocalized(strval(trans('config.month_and_day')))]
         );
         $breadcrumbs->push($title, route('transactions.index', [$what, $moment]));
     }
diff --git a/app/Import/ImportEntry.php b/app/Import/ImportEntry.php
index fba65e99d4..43ecf7b445 100644
--- a/app/Import/ImportEntry.php
+++ b/app/Import/ImportEntry.php
@@ -9,7 +9,7 @@
  * See the LICENSE file for details.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace FireflyIII\Import;
 
@@ -215,7 +215,7 @@ class ImportEntry
      */
     private function setAppendableString(string $field, string $value)
     {
-        $value = trim($value);
+        $value                = trim($value);
         $this->fields[$field] .= ' ' . $value;
     }
 
diff --git a/app/Models/AccountType.php b/app/Models/AccountType.php
index 3efa588ada..6d6a62eddd 100644
--- a/app/Models/AccountType.php
+++ b/app/Models/AccountType.php
@@ -9,7 +9,7 @@
  * See the LICENSE file for details.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace FireflyIII\Models;
 
@@ -48,6 +48,7 @@ class AccountType extends Model
     protected $dates = ['created_at', 'updated_at'];
 
     //
+
     /**
      * @return HasMany
      */
diff --git a/app/Models/ImportJob.php b/app/Models/ImportJob.php
index b8a7bd27c3..66dfc167eb 100644
--- a/app/Models/ImportJob.php
+++ b/app/Models/ImportJob.php
@@ -9,7 +9,7 @@
  * See the LICENSE file for details.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace FireflyIII\Models;
 
@@ -71,8 +71,8 @@ class ImportJob extends Model
      */
     public function addStepsDone(int $count)
     {
-        $status = $this->extended_status;
-        $status['steps_done'] += $count;
+        $status                = $this->extended_status;
+        $status['steps_done']  += $count;
         $this->extended_status = $status;
         $this->save();
 
@@ -83,7 +83,7 @@ class ImportJob extends Model
      */
     public function addTotalSteps(int $count)
     {
-        $status = $this->extended_status;
+        $status                = $this->extended_status;
         $status['total_steps'] += $count;
         $this->extended_status = $status;
         $this->save();
diff --git a/app/Models/Preference.php b/app/Models/Preference.php
index f246650b48..7b7922b4e0 100644
--- a/app/Models/Preference.php
+++ b/app/Models/Preference.php
@@ -9,14 +9,14 @@
  * See the LICENSE file for details.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace FireflyIII\Models;
 
+use Crypt;
 use FireflyIII\Exceptions\FireflyException;
 use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Database\Eloquent\Model;
-use Crypt;
 use Log;
 
 /**
diff --git a/app/Support/Binder/JournalList.php b/app/Support/Binder/JournalList.php
index a6f811d741..cc31681323 100644
--- a/app/Support/Binder/JournalList.php
+++ b/app/Support/Binder/JournalList.php
@@ -9,7 +9,7 @@
  * See the LICENSE file for details.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace FireflyIII\Support\Binder;
 
@@ -39,11 +39,13 @@ class JournalList implements BinderInterface
             $object = TransactionJournal::whereIn('transaction_journals.id', $ids)
                                         ->expanded()
                                         ->where('transaction_journals.user_id', auth()->user()->id)
-                                        ->get([
-                                                  'transaction_journals.*',
-                                                  'transaction_types.type AS transaction_type_type',
-                                                  'transaction_currencies.code AS transaction_currency_code',
-                                              ]);
+                                        ->get(
+                                            [
+                                                'transaction_journals.*',
+                                                'transaction_types.type AS transaction_type_type',
+                                                'transaction_currencies.code AS transaction_currency_code',
+                                            ]
+                                        );
 
             if ($object->count() > 0) {
                 return $object;
diff --git a/app/Support/Models/TransactionJournalTrait.php b/app/Support/Models/TransactionJournalTrait.php
index 98c74a416c..c9cea3ec49 100644
--- a/app/Support/Models/TransactionJournalTrait.php
+++ b/app/Support/Models/TransactionJournalTrait.php
@@ -7,7 +7,7 @@
  * See the LICENSE file for details.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace FireflyIII\Support\Models;
 
@@ -15,10 +15,8 @@ namespace FireflyIII\Support\Models;
 use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Transaction;
-use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
 
 /**
@@ -107,7 +105,7 @@ trait TransactionJournalTrait
     }
 
     /**
-     * @param string             $dateField
+     * @param string $dateField
      *
      * @return string
      */
@@ -118,7 +116,7 @@ trait TransactionJournalTrait
         }
         if (!is_null($this->$dateField) && $this->$dateField instanceof Carbon) {
             // make field NULL
-            $carbon              = clone $this->$dateField;
+            $carbon           = clone $this->$dateField;
             $this->$dateField = null;
             $this->save();
 
diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php
index ef8982988c..b4f4ee4e19 100644
--- a/app/Validation/FireflyValidator.php
+++ b/app/Validation/FireflyValidator.php
@@ -9,7 +9,7 @@
  * See the LICENSE file for details.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace FireflyIII\Validation;
 
@@ -29,7 +29,6 @@ use Google2FA;
 use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Contracts\Translation\Translator;
 use Illuminate\Validation\Validator;
-use Log;
 use Session;
 
 /**