diff --git a/app/Console/Commands/Import.php b/app/Console/Commands/Import.php
index b8cecf4202..f37203cc41 100644
--- a/app/Console/Commands/Import.php
+++ b/app/Console/Commands/Import.php
@@ -16,9 +16,7 @@ namespace FireflyIII\Console\Commands;
 use FireflyIII\Import\Logging\CommandHandler;
 use FireflyIII\Import\Routine\ImportRoutine;
 use FireflyIII\Models\ImportJob;
-use FireflyIII\Models\TransactionJournal;
 use Illuminate\Console\Command;
-use Illuminate\Support\Collection;
 use Illuminate\Support\MessageBag;
 use Log;
 
diff --git a/app/Helpers/Filter/AmountFilter.php b/app/Helpers/Filter/AmountFilter.php
index eb4ab55662..7fdd9eb966 100644
--- a/app/Helpers/Filter/AmountFilter.php
+++ b/app/Helpers/Filter/AmountFilter.php
@@ -53,4 +53,4 @@ class AmountFilter implements FilterInterface
             }
         );
     }
-}
\ No newline at end of file
+}
diff --git a/app/Helpers/Filter/EmptyFilter.php b/app/Helpers/Filter/EmptyFilter.php
index 23a4172e88..5fa9f64521 100644
--- a/app/Helpers/Filter/EmptyFilter.php
+++ b/app/Helpers/Filter/EmptyFilter.php
@@ -31,4 +31,4 @@ class EmptyFilter implements FilterInterface
     {
         return $set;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Helpers/Filter/FilterInterface.php b/app/Helpers/Filter/FilterInterface.php
index d2dcb9eda4..f189eb10ff 100644
--- a/app/Helpers/Filter/FilterInterface.php
+++ b/app/Helpers/Filter/FilterInterface.php
@@ -23,4 +23,4 @@ interface FilterInterface
      */
     public function filter(Collection $set): Collection;
 
-}
\ No newline at end of file
+}
diff --git a/app/Helpers/Filter/InternalTransferFilter.php b/app/Helpers/Filter/InternalTransferFilter.php
index 24b4b9727c..7ab06618aa 100644
--- a/app/Helpers/Filter/InternalTransferFilter.php
+++ b/app/Helpers/Filter/InternalTransferFilter.php
@@ -70,4 +70,4 @@ class InternalTransferFilter implements FilterInterface
 
 
     }
-}
\ No newline at end of file
+}
diff --git a/app/Helpers/Filter/NegativeAmountFilter.php b/app/Helpers/Filter/NegativeAmountFilter.php
index f2ef34bcc4..e1e494127e 100644
--- a/app/Helpers/Filter/NegativeAmountFilter.php
+++ b/app/Helpers/Filter/NegativeAmountFilter.php
@@ -44,4 +44,4 @@ class NegativeAmountFilter implements FilterInterface
             }
         );
     }
-}
\ No newline at end of file
+}
diff --git a/app/Helpers/Filter/OpposingAccountFilter.php b/app/Helpers/Filter/OpposingAccountFilter.php
index 69a1567943..663f9a35ce 100644
--- a/app/Helpers/Filter/OpposingAccountFilter.php
+++ b/app/Helpers/Filter/OpposingAccountFilter.php
@@ -60,4 +60,4 @@ class OpposingAccountFilter implements FilterInterface
             }
         );
     }
-}
\ No newline at end of file
+}
diff --git a/app/Helpers/Filter/PositiveAmountFilter.php b/app/Helpers/Filter/PositiveAmountFilter.php
index ddb71841da..e3d4065942 100644
--- a/app/Helpers/Filter/PositiveAmountFilter.php
+++ b/app/Helpers/Filter/PositiveAmountFilter.php
@@ -47,4 +47,4 @@ class PositiveAmountFilter implements FilterInterface
             }
         );
     }
-}
\ No newline at end of file
+}
diff --git a/app/Helpers/Filter/TransferFilter.php b/app/Helpers/Filter/TransferFilter.php
index d33d5e41ed..1aa0b5bd43 100644
--- a/app/Helpers/Filter/TransferFilter.php
+++ b/app/Helpers/Filter/TransferFilter.php
@@ -55,4 +55,4 @@ class TransferFilter implements FilterInterface
 
         return $new;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Helpers/Report/PopupReport.php b/app/Helpers/Report/PopupReport.php
index 265c930e6c..7823eb95b8 100644
--- a/app/Helpers/Report/PopupReport.php
+++ b/app/Helpers/Report/PopupReport.php
@@ -196,4 +196,4 @@ class PopupReport implements PopupReportInterface
 
         return $journals;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Helpers/Report/PopupReportInterface.php b/app/Helpers/Report/PopupReportInterface.php
index 79ca4be007..388c1a1d91 100644
--- a/app/Helpers/Report/PopupReportInterface.php
+++ b/app/Helpers/Report/PopupReportInterface.php
@@ -80,4 +80,4 @@ interface PopupReportInterface
      * @return Collection
      */
     public function byIncome(Account $account, array $attributes): Collection;
-}
\ No newline at end of file
+}
diff --git a/app/Http/Controllers/AttachmentController.php b/app/Http/Controllers/AttachmentController.php
index 8e1bba3a03..3f06091f35 100644
--- a/app/Http/Controllers/AttachmentController.php
+++ b/app/Http/Controllers/AttachmentController.php
@@ -105,7 +105,6 @@ class AttachmentController extends Controller
             $quoted  = sprintf('"%s"', addcslashes(basename($attachment->filename), '"\\'));
 
 
-
             /** @var LaravelResponse $response */
             $response = response($content, 200);
             $response
diff --git a/app/Http/Controllers/Chart/TagReportController.php b/app/Http/Controllers/Chart/TagReportController.php
index 2aca50bc77..5c3ee98ed1 100644
--- a/app/Http/Controllers/Chart/TagReportController.php
+++ b/app/Http/Controllers/Chart/TagReportController.php
@@ -364,4 +364,4 @@ class TagReportController extends Controller
         return $grouped;
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/Http/Controllers/ImportController.php b/app/Http/Controllers/ImportController.php
index 310b418789..c4b0bd1342 100644
--- a/app/Http/Controllers/ImportController.php
+++ b/app/Http/Controllers/ImportController.php
@@ -246,7 +246,7 @@ class ImportController extends Controller
         /** @var ImportRoutine $routine */
         $routine = app(ImportRoutine::class);
         $routine->setJob($job);
-        $result  = $routine->run();
+        $result = $routine->run();
         if ($result) {
             return Response::json(['run' => 'ok']);
         }
diff --git a/app/Http/Controllers/Json/ExchangeController.php b/app/Http/Controllers/Json/ExchangeController.php
index 79f88acf2c..b1e3b5a60d 100644
--- a/app/Http/Controllers/Json/ExchangeController.php
+++ b/app/Http/Controllers/Json/ExchangeController.php
@@ -62,4 +62,4 @@ class ExchangeController extends Controller
         return Response::json($return);
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php
index f4dc60cee9..e186f04d87 100644
--- a/app/Http/Controllers/PiggyBankController.php
+++ b/app/Http/Controllers/PiggyBankController.php
@@ -329,8 +329,8 @@ class PiggyBankController extends Controller
 
         Session::flash(
             'error', strval(
-            trans('firefly.cannot_remove_from_piggy', ['amount' => Amount::formatAnything($currency, $amount, false), 'name' => e($piggyBank->name)])
-        )
+                       trans('firefly.cannot_remove_from_piggy', ['amount' => Amount::formatAnything($currency, $amount, false), 'name' => e($piggyBank->name)])
+                   )
         );
 
         return redirect(route('piggy-banks.index'));
diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php
index 1636ded76c..6d088942b4 100644
--- a/app/Http/Controllers/TransactionController.php
+++ b/app/Http/Controllers/TransactionController.php
@@ -86,7 +86,7 @@ class TransactionController extends Controller
             $first    = $repository->first();
             $start    = $first->date ?? new Carbon;
             $end      = new Carbon;
-            $path = '/transactions/'.$what.'/all/';
+            $path     = '/transactions/' . $what . '/all/';
         }
 
         // prep for "specific date" view.
diff --git a/app/Import/Configurator/ConfiguratorInterface.php b/app/Import/Configurator/ConfiguratorInterface.php
index 4969109b01..1f120d30d3 100644
--- a/app/Import/Configurator/ConfiguratorInterface.php
+++ b/app/Import/Configurator/ConfiguratorInterface.php
@@ -34,13 +34,6 @@ interface ConfiguratorInterface
      */
     public function configureJob(array $data): bool;
 
-    /**
-     * @param ImportJob $job
-     *
-     * @return void
-     */
-    public function setJob(ImportJob $job);
-
     /**
      * Return the data required for the next step in the job configuration.
      *
@@ -62,4 +55,11 @@ interface ConfiguratorInterface
      */
     public function isJobConfigured(): bool;
 
-}
\ No newline at end of file
+    /**
+     * @param ImportJob $job
+     *
+     * @return void
+     */
+    public function setJob(ImportJob $job);
+
+}
diff --git a/app/Import/Configurator/CsvConfigurator.php b/app/Import/Configurator/CsvConfigurator.php
index a3c9750fee..4e7d4ff476 100644
--- a/app/Import/Configurator/CsvConfigurator.php
+++ b/app/Import/Configurator/CsvConfigurator.php
@@ -156,4 +156,4 @@ class CsvConfigurator implements ConfiguratorInterface
 
         return $class;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Import/FileProcessor/CsvProcessor.php b/app/Import/FileProcessor/CsvProcessor.php
index 5585cf4b04..5be25f5ed1 100644
--- a/app/Import/FileProcessor/CsvProcessor.php
+++ b/app/Import/FileProcessor/CsvProcessor.php
@@ -232,4 +232,4 @@ class CsvProcessor implements FileProcessorInterface
         return $row;
 
     }
-}
\ No newline at end of file
+}
diff --git a/app/Import/FileProcessor/FileProcessorInterface.php b/app/Import/FileProcessor/FileProcessorInterface.php
index 5dfccd4dd7..0813246750 100644
--- a/app/Import/FileProcessor/FileProcessorInterface.php
+++ b/app/Import/FileProcessor/FileProcessorInterface.php
@@ -39,4 +39,4 @@ interface FileProcessorInterface
      * @return FileProcessorInterface
      */
     public function setJob(ImportJob $job): FileProcessorInterface;
-}
\ No newline at end of file
+}
diff --git a/app/Import/Object/ImportAccount.php b/app/Import/Object/ImportAccount.php
index 19ff1c8f40..22295cae12 100644
--- a/app/Import/Object/ImportAccount.php
+++ b/app/Import/Object/ImportAccount.php
@@ -296,4 +296,4 @@ class ImportAccount
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/app/Import/Object/ImportBill.php b/app/Import/Object/ImportBill.php
index c3d5f2f93d..729a290d3b 100644
--- a/app/Import/Object/ImportBill.php
+++ b/app/Import/Object/ImportBill.php
@@ -225,4 +225,4 @@ class ImportBill
         return true;
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/Import/Object/ImportBudget.php b/app/Import/Object/ImportBudget.php
index b3732a4efa..011fef8c8e 100644
--- a/app/Import/Object/ImportBudget.php
+++ b/app/Import/Object/ImportBudget.php
@@ -226,4 +226,4 @@ class ImportBudget
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/app/Import/Object/ImportCategory.php b/app/Import/Object/ImportCategory.php
index f8ee78442e..69265fcd3a 100644
--- a/app/Import/Object/ImportCategory.php
+++ b/app/Import/Object/ImportCategory.php
@@ -30,33 +30,17 @@ class ImportCategory
     private $repository;
     /** @var  User */
     private $user;
-    /**
-     * @param array $id
-     */
-    public function setId(array $id)
-    {
-        $this->id = $id;
-    }
 
     /**
      * ImportCategory constructor.
      */
     public function __construct()
     {
-        $this->category = new Category();
+        $this->category   = new Category();
         $this->repository = app(CategoryRepositoryInterface::class);
         Log::debug('Created ImportCategory.');
     }
 
-    /**
-     * @param array $name
-     */
-    public function setName(array $name)
-    {
-        $this->name = $name;
-    }
-
-
     /**
      * @return Category
      */
@@ -68,6 +52,23 @@ class ImportCategory
 
         return $this->category;
     }
+
+    /**
+     * @param array $id
+     */
+    public function setId(array $id)
+    {
+        $this->id = $id;
+    }
+
+    /**
+     * @param array $name
+     */
+    public function setName(array $name)
+    {
+        $this->name = $name;
+    }
+
     /**
      * @param User $user
      */
@@ -100,7 +101,7 @@ class ImportCategory
         if (count($this->name) === 3) {
             /** @var Collection $categories */
             $categories = $this->repository->getCategories();
-            $name    = $this->name['value'];
+            $name       = $this->name['value'];
             Log::debug(sprintf('Finding category with name %s', $name));
             $filtered = $categories->filter(
                 function (Category $category) use ($name) {
@@ -219,4 +220,4 @@ class ImportCategory
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/app/Import/Object/ImportCurrency.php b/app/Import/Object/ImportCurrency.php
index 6791caba62..983c2591ae 100644
--- a/app/Import/Object/ImportCurrency.php
+++ b/app/Import/Object/ImportCurrency.php
@@ -53,7 +53,7 @@ class ImportCurrency
         }
         Log::debug('In createCurrency()');
         // check if any of them is mapped:
-        $mapped   = $this->findMappedObject();
+        $mapped = $this->findMappedObject();
 
         if (!is_null($mapped->id)) {
 
@@ -215,4 +215,4 @@ class ImportCurrency
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/app/Import/Object/ImportJournal.php b/app/Import/Object/ImportJournal.php
index ce3af83147..8c6c86384b 100644
--- a/app/Import/Object/ImportJournal.php
+++ b/app/Import/Object/ImportJournal.php
@@ -272,4 +272,4 @@ class ImportJournal
                 break;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/Import/Object/ImportTransaction.php b/app/Import/Object/ImportTransaction.php
index cbb6a453cd..696aaaac6c 100644
--- a/app/Import/Object/ImportTransaction.php
+++ b/app/Import/Object/ImportTransaction.php
@@ -154,4 +154,4 @@ class ImportTransaction
         return round(floatval($value), 12);
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/Import/Routine/ImportRoutine.php b/app/Import/Routine/ImportRoutine.php
index 6177f7a464..ee8fd22c6b 100644
--- a/app/Import/Routine/ImportRoutine.php
+++ b/app/Import/Routine/ImportRoutine.php
@@ -44,15 +44,6 @@ class ImportRoutine
         $this->errors   = new Collection;
     }
 
-    /**
-     * @param ImportJob $job
-     */
-    public function setJob(ImportJob $job)
-    {
-        $this->job = $job;
-    }
-
-
     /**
      *
      */
@@ -90,6 +81,14 @@ class ImportRoutine
         return true;
     }
 
+    /**
+     * @param ImportJob $job
+     */
+    public function setJob(ImportJob $job)
+    {
+        $this->job = $job;
+    }
+
     /**
      * @return Collection
      */
@@ -164,4 +163,4 @@ class ImportRoutine
 
         return $storage;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Import/Storage/ImportStorage.php b/app/Import/Storage/ImportStorage.php
index 23d1ed9ad4..b366aeb8c7 100644
--- a/app/Import/Storage/ImportStorage.php
+++ b/app/Import/Storage/ImportStorage.php
@@ -379,4 +379,4 @@ class ImportStorage
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/Mail/RegisteredUser.php b/app/Mail/RegisteredUser.php
index d988506393..ea8e6a7e63 100644
--- a/app/Mail/RegisteredUser.php
+++ b/app/Mail/RegisteredUser.php
@@ -22,8 +22,8 @@ class RegisteredUser extends Mailable
      */
     public function __construct(string $address, string $ipAddress)
     {
-        $this->address = $address;
-        $this->ipAddress  = $ipAddress;
+        $this->address   = $address;
+        $this->ipAddress = $ipAddress;
     }
 
     /**
diff --git a/app/Models/CurrencyExchangeRate.php b/app/Models/CurrencyExchangeRate.php
index 2c7d12558c..bfd66f881f 100644
--- a/app/Models/CurrencyExchangeRate.php
+++ b/app/Models/CurrencyExchangeRate.php
@@ -50,4 +50,4 @@ class CurrencyExchangeRate extends Model
         return $this->belongsTo(User::class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/Models/ImportJob.php b/app/Models/ImportJob.php
index 5b3febd6c5..4f23de2c83 100644
--- a/app/Models/ImportJob.php
+++ b/app/Models/ImportJob.php
@@ -86,7 +86,7 @@ class ImportJob extends Model
      */
     public function addStepsDone(int $count)
     {
-        $status = $this->extended_status;
+        $status                = $this->extended_status;
         $status['done']        += $count;
         $this->extended_status = $status;
         $this->save();
diff --git a/app/Models/Tag.php b/app/Models/Tag.php
index 19573b2b29..21430124c2 100644
--- a/app/Models/Tag.php
+++ b/app/Models/Tag.php
@@ -133,9 +133,10 @@ class Tag extends Model
      */
     public function getTagAttribute($value)
     {
-        if(is_null($value)) {
+        if (is_null($value)) {
             return null;
         }
+
         return Crypt::decrypt($value);
     }
 
diff --git a/app/Repositories/Account/FindAccountsTrait.php b/app/Repositories/Account/FindAccountsTrait.php
index a3a4248ab2..e06a598a47 100644
--- a/app/Repositories/Account/FindAccountsTrait.php
+++ b/app/Repositories/Account/FindAccountsTrait.php
@@ -212,4 +212,4 @@ trait FindAccountsTrait
 
         return $account;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Repositories/Journal/CreateJournalsTrait.php b/app/Repositories/Journal/CreateJournalsTrait.php
index 77b97eadd2..44064b7432 100644
--- a/app/Repositories/Journal/CreateJournalsTrait.php
+++ b/app/Repositories/Journal/CreateJournalsTrait.php
@@ -188,4 +188,4 @@ trait CreateJournalsTrait
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/Repositories/Journal/SupportJournalsTrait.php b/app/Repositories/Journal/SupportJournalsTrait.php
index 601c8cf9b7..df57879971 100644
--- a/app/Repositories/Journal/SupportJournalsTrait.php
+++ b/app/Repositories/Journal/SupportJournalsTrait.php
@@ -243,4 +243,4 @@ trait SupportJournalsTrait
 
         return $data;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Repositories/Journal/UpdateJournalsTrait.php b/app/Repositories/Journal/UpdateJournalsTrait.php
index 8e249d5bff..9bf2cae058 100644
--- a/app/Repositories/Journal/UpdateJournalsTrait.php
+++ b/app/Repositories/Journal/UpdateJournalsTrait.php
@@ -153,4 +153,4 @@ trait UpdateJournalsTrait
 
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Rules/Triggers/HasAttachment.php b/app/Rules/Triggers/HasAttachment.php
index 4fc3bd720f..6fc86c6a6c 100644
--- a/app/Rules/Triggers/HasAttachment.php
+++ b/app/Rules/Triggers/HasAttachment.php
@@ -58,4 +58,4 @@ class HasAttachment extends AbstractTrigger implements TriggerInterface
 
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Services/Currency/ExchangeRateInterface.php b/app/Services/Currency/ExchangeRateInterface.php
index a37133db9a..69a8040a5d 100644
--- a/app/Services/Currency/ExchangeRateInterface.php
+++ b/app/Services/Currency/ExchangeRateInterface.php
@@ -35,4 +35,4 @@ interface ExchangeRateInterface
      */
     public function setUser(User $user);
 
-}
\ No newline at end of file
+}
diff --git a/app/Services/Currency/FixerIO.php b/app/Services/Currency/FixerIO.php
index e77a7777ba..7a3290bb96 100644
--- a/app/Services/Currency/FixerIO.php
+++ b/app/Services/Currency/FixerIO.php
@@ -68,4 +68,4 @@ class FixerIO implements ExchangeRateInterface
     {
         $this->user = $user;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Support/Binder/CurrencyCode.php b/app/Support/Binder/CurrencyCode.php
index 4616ce5ef2..39b0a73915 100644
--- a/app/Support/Binder/CurrencyCode.php
+++ b/app/Support/Binder/CurrencyCode.php
@@ -36,4 +36,4 @@ class CurrencyCode implements BinderInterface
         }
         throw new NotFoundHttpException;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Support/Import/Configuration/ConfigurationInterface.php b/app/Support/Import/Configuration/ConfigurationInterface.php
index f44203517e..7f13ebe167 100644
--- a/app/Support/Import/Configuration/ConfigurationInterface.php
+++ b/app/Support/Import/Configuration/ConfigurationInterface.php
@@ -43,4 +43,4 @@ interface ConfigurationInterface
      */
     public function storeConfiguration(array $data): bool;
 
-}
\ No newline at end of file
+}
diff --git a/app/Support/Import/Configuration/Csv/Initial.php b/app/Support/Import/Configuration/Csv/Initial.php
index 096d997f5e..30eabec6dc 100644
--- a/app/Support/Import/Configuration/Csv/Initial.php
+++ b/app/Support/Import/Configuration/Csv/Initial.php
@@ -121,4 +121,4 @@ class Initial implements ConfigurationInterface
 
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Support/Import/Configuration/Csv/Map.php b/app/Support/Import/Configuration/Csv/Map.php
index eb51c04e4d..813cecd071 100644
--- a/app/Support/Import/Configuration/Csv/Map.php
+++ b/app/Support/Import/Configuration/Csv/Map.php
@@ -265,4 +265,4 @@ class Map implements ConfigurationInterface
 
         return $column;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Support/Import/Configuration/Csv/Roles.php b/app/Support/Import/Configuration/Csv/Roles.php
index ced9b88aa0..445628aeab 100644
--- a/app/Support/Import/Configuration/Csv/Roles.php
+++ b/app/Support/Import/Configuration/Csv/Roles.php
@@ -264,4 +264,4 @@ class Roles implements ConfigurationInterface
 
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Support/Search/Modifier.php b/app/Support/Search/Modifier.php
index 18e94d3aff..4422cf2e56 100644
--- a/app/Support/Search/Modifier.php
+++ b/app/Support/Search/Modifier.php
@@ -208,4 +208,4 @@ class Modifier
 
         return self::stringCompare($journalCategory, $search) || self::stringCompare($transactionCategory, $search);
     }
-}
\ No newline at end of file
+}
diff --git a/app/Support/Search/Search.php b/app/Support/Search/Search.php
index ebceaf59f9..490e24708a 100644
--- a/app/Support/Search/Search.php
+++ b/app/Support/Search/Search.php
@@ -53,7 +53,7 @@ class Search implements SearchInterface
     public function __construct()
     {
         $this->modifiers      = new Collection;
-        $this->validModifiers = (array) config('firefly.search_modifiers');
+        $this->validModifiers = (array)config('firefly.search_modifiers');
     }
 
     /**
diff --git a/app/Support/Steam.php b/app/Support/Steam.php
index 32e07f08dc..8a3ca9c885 100644
--- a/app/Support/Steam.php
+++ b/app/Support/Steam.php
@@ -13,7 +13,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Support;
 
-use \Amount as GlobalAmount;
+use Amount as GlobalAmount;
 use Carbon\Carbon;
 use Crypt;
 use DB;
diff --git a/app/Support/Twig/AmountFormat.php b/app/Support/Twig/AmountFormat.php
index db267e4401..55e5c28942 100644
--- a/app/Support/Twig/AmountFormat.php
+++ b/app/Support/Twig/AmountFormat.php
@@ -265,4 +265,4 @@ class AmountFormat extends Twig_Extension
         );
     }
 
-}
\ No newline at end of file
+}
diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
index 2727d4d86c..c014cb7078 100644
--- a/database/factories/ModelFactory.php
+++ b/database/factories/ModelFactory.php
@@ -244,4 +244,4 @@ $factory->define(
         'foreign_currency_symbol'     => null,
     ];
 }
-);
\ No newline at end of file
+);
diff --git a/resources/views/bills/index.twig b/resources/views/bills/index.twig
index b56f32da2b..55d2280420 100644
--- a/resources/views/bills/index.twig
+++ b/resources/views/bills/index.twig
@@ -31,4 +31,4 @@
             </div>
         </div>
     {% endif %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/resources/views/partials/empty.twig b/resources/views/partials/empty.twig
index 4dead2ac1d..43285b55ab 100644
--- a/resources/views/partials/empty.twig
+++ b/resources/views/partials/empty.twig
@@ -20,4 +20,4 @@
 
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/tests/Feature/Controllers/Auth/ForgotPasswordControllerTest.php b/tests/Feature/Controllers/Auth/ForgotPasswordControllerTest.php
index 34e1d7e36a..7d180e5b95 100644
--- a/tests/Feature/Controllers/Auth/ForgotPasswordControllerTest.php
+++ b/tests/Feature/Controllers/Auth/ForgotPasswordControllerTest.php
@@ -48,4 +48,4 @@ class ForgotPasswordControllerTest extends TestCase
         $response = $this->post(route('password.email'), $data);
         $response->assertStatus(302);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Feature/Controllers/Chart/BudgetReportControllerTest.php b/tests/Feature/Controllers/Chart/BudgetReportControllerTest.php
index a00de386f1..51f68239f9 100644
--- a/tests/Feature/Controllers/Chart/BudgetReportControllerTest.php
+++ b/tests/Feature/Controllers/Chart/BudgetReportControllerTest.php
@@ -118,4 +118,4 @@ class BudgetReportControllerTest extends TestCase
         $response->assertStatus(200);
     }
 
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/Handlers/Events/UserEventHandlerTest.php b/tests/Unit/Handlers/Events/UserEventHandlerTest.php
index 27b44dfb72..dc0e36a62c 100644
--- a/tests/Unit/Handlers/Events/UserEventHandlerTest.php
+++ b/tests/Unit/Handlers/Events/UserEventHandlerTest.php
@@ -85,4 +85,4 @@ class UserEventHandlerTest extends TestCase
         $this->assertTrue(true);
     }
 
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/Helpers/AttachmentHelperTest.php b/tests/Unit/Helpers/AttachmentHelperTest.php
index 47f039f332..5f2d64308e 100644
--- a/tests/Unit/Helpers/AttachmentHelperTest.php
+++ b/tests/Unit/Helpers/AttachmentHelperTest.php
@@ -133,4 +133,4 @@ class AttachmentHelperTest extends TestCase
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/Helpers/MetaPieChartTest.php b/tests/Unit/Helpers/MetaPieChartTest.php
index e47c9e0cd4..983ff8016d 100644
--- a/tests/Unit/Helpers/MetaPieChartTest.php
+++ b/tests/Unit/Helpers/MetaPieChartTest.php
@@ -208,4 +208,4 @@ class MetaPieChartTest extends TestCase
         return $set;
     }
 
-}
\ No newline at end of file
+}