diff --git a/app/Handlers/Events/JournalDeletedHandler.php b/app/Handlers/Events/JournalDeletedHandler.php
index 16ad7b51e3..bcc3782511 100644
--- a/app/Handlers/Events/JournalDeletedHandler.php
+++ b/app/Handlers/Events/JournalDeletedHandler.php
@@ -1,16 +1,18 @@
 <?php namespace FireflyIII\Handlers\Events;
 
 use FireflyIII\Events\JournalDeleted;
-use Illuminate\Contracts\Queue\ShouldBeQueued;
-use Illuminate\Queue\InteractsWithQueue;
 
+/**
+ * Class JournalDeletedHandler
+ *
+ * @package FireflyIII\Handlers\Events
+ */
 class JournalDeletedHandler
 {
 
     /**
      * Create the event handler.
      *
-     * @return void
      */
     public function __construct()
     {
diff --git a/app/Handlers/Events/UpdateJournalConnection.php b/app/Handlers/Events/UpdateJournalConnection.php
index 346a806abc..1b65567663 100644
--- a/app/Handlers/Events/UpdateJournalConnection.php
+++ b/app/Handlers/Events/UpdateJournalConnection.php
@@ -3,8 +3,12 @@
 use FireflyIII\Events\JournalSaved;
 use FireflyIII\Models\PiggyBankEvent;
 use FireflyIII\Models\Transaction;
-use FireflyIII\Models\TransactionJournal;
 
+/**
+ * Class UpdateJournalConnection
+ *
+ * @package FireflyIII\Handlers\Events
+ */
 class UpdateJournalConnection
 {
 
diff --git a/app/Http/Controllers/GoogleChartController.php b/app/Http/Controllers/GoogleChartController.php
index a2faed935c..c7095c0c84 100644
--- a/app/Http/Controllers/GoogleChartController.php
+++ b/app/Http/Controllers/GoogleChartController.php
@@ -6,7 +6,6 @@ use Carbon\Carbon;
 use DB;
 use Exception;
 use FireflyIII\Helpers\Report\ReportQueryInterface;
-use FireflyIII\Http\Requests;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\Budget;
diff --git a/app/Http/Controllers/HelpController.php b/app/Http/Controllers/HelpController.php
index fe3194ea61..c2057ccb7f 100644
--- a/app/Http/Controllers/HelpController.php
+++ b/app/Http/Controllers/HelpController.php
@@ -2,7 +2,6 @@
 
 use Cache;
 use ErrorException;
-use FireflyIII\Http\Requests;
 use League\CommonMark\CommonMarkConverter;
 use Response;
 use Route;
diff --git a/app/Http/Controllers/JsonController.php b/app/Http/Controllers/JsonController.php
index b444c29251..298b389018 100644
--- a/app/Http/Controllers/JsonController.php
+++ b/app/Http/Controllers/JsonController.php
@@ -3,15 +3,14 @@
 use Amount;
 use Auth;
 use DB;
-use FireflyIII\Http\Requests;
 use FireflyIII\Models\Bill;
+use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use Input;
 use Preferences;
 use Response;
 use Session;
-use Config;
-use FireflyIII\Models\TransactionType;
+
 /**
  * Class JsonController
  *
@@ -182,16 +181,17 @@ class JsonController extends Controller
     public function transactionJournals($what)
     {
         $descriptions = [];
-            $dbType   = TransactionType::whereType($what)->first();
-            $journals = Auth::user()->transactionjournals()->where('transaction_type_id', $dbType->id)
-                ->orderBy('id','DESC')->take(50)
-                ->get();
-            foreach($journals as $j) {
-                $descriptions[] = $j->description;
-            }
+        $dbType       = TransactionType::whereType($what)->first();
+        $journals     = Auth::user()->transactionjournals()->where('transaction_type_id', $dbType->id)
+                            ->orderBy('id', 'DESC')->take(50)
+                            ->get();
+        foreach ($journals as $j) {
+            $descriptions[] = $j->description;
+        }
 
         $descriptions = array_unique($descriptions);
         sort($descriptions);
+
         return Response::json($descriptions);
 
 
diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php
index c80fa70c28..dd0a6979c0 100644
--- a/app/Http/Controllers/PiggyBankController.php
+++ b/app/Http/Controllers/PiggyBankController.php
@@ -7,7 +7,6 @@ use Config;
 use ExpandedForm;
 use FireflyIII\Http\Requests;
 use FireflyIII\Http\Requests\PiggyBankFormRequest;
-use FireflyIII\Models\Account;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\PiggyBankEvent;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
diff --git a/app/Http/Controllers/RelatedController.php b/app/Http/Controllers/RelatedController.php
index 6e5102bf52..5bdebaae3a 100644
--- a/app/Http/Controllers/RelatedController.php
+++ b/app/Http/Controllers/RelatedController.php
@@ -1,7 +1,6 @@
 <?php namespace FireflyIII\Http\Controllers;
 
 use Auth;
-use FireflyIII\Http\Requests;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\TransactionJournal;
diff --git a/app/Http/Controllers/ReminderController.php b/app/Http/Controllers/ReminderController.php
index 379274a3af..72bd61b0b4 100644
--- a/app/Http/Controllers/ReminderController.php
+++ b/app/Http/Controllers/ReminderController.php
@@ -3,7 +3,6 @@
 use Auth;
 use Carbon\Carbon;
 use FireflyIII\Helpers\Reminders\ReminderHelperInterface;
-use FireflyIII\Http\Requests;
 use FireflyIII\Models\Reminder;
 use Redirect;
 use Session;
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index ef345a6f96..c448fd462e 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -5,7 +5,6 @@ use Carbon\Carbon;
 use Exception;
 use FireflyIII\Helpers\Report\ReportHelperInterface;
 use FireflyIII\Helpers\Report\ReportQueryInterface;
-use FireflyIII\Http\Requests;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Database\Query\JoinClause;
diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
index 8c54a3170e..4a6016fadd 100644
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -1,6 +1,5 @@
 <?php namespace FireflyIII\Http\Controllers;
 
-use FireflyIII\Http\Requests;
 use FireflyIII\Support\Search\SearchInterface;
 use Input;
 
diff --git a/app/Http/Middleware/PiggyBanks.php b/app/Http/Middleware/PiggyBanks.php
index 4e6aebc9a4..df05b3d8fe 100644
--- a/app/Http/Middleware/PiggyBanks.php
+++ b/app/Http/Middleware/PiggyBanks.php
@@ -7,7 +7,6 @@ use Carbon\Carbon;
 use Closure;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\PiggyBankRepetition;
-use FireflyIII\Models\Reminder;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Database\Query\JoinClause;
 use Illuminate\Http\Request;
diff --git a/app/Http/Requests/JournalFormRequest.php b/app/Http/Requests/JournalFormRequest.php
index 42b7c3122e..368564896e 100644
--- a/app/Http/Requests/JournalFormRequest.php
+++ b/app/Http/Requests/JournalFormRequest.php
@@ -3,7 +3,6 @@
 namespace FireflyIII\Http\Requests;
 
 use Auth;
-use FireflyIII\Models\Account;
 use Input;
 use Exception;
 /**
@@ -24,6 +23,7 @@ class JournalFormRequest extends Request
 
     /**
      * @return array
+     * @throws Exception
      */
     public function rules()
     {
diff --git a/app/Http/Requests/PiggyBankFormRequest.php b/app/Http/Requests/PiggyBankFormRequest.php
index 768eda19a4..50267f2b47 100644
--- a/app/Http/Requests/PiggyBankFormRequest.php
+++ b/app/Http/Requests/PiggyBankFormRequest.php
@@ -4,7 +4,6 @@ namespace FireflyIII\Http\Requests;
 
 use Auth;
 use Carbon\Carbon;
-use FireflyIII\Models\Account;
 use Input;
 use Navigation;
 
diff --git a/app/Http/Requests/ProfileFormRequest.php b/app/Http/Requests/ProfileFormRequest.php
index 2b337a1037..43cc40da09 100644
--- a/app/Http/Requests/ProfileFormRequest.php
+++ b/app/Http/Requests/ProfileFormRequest.php
@@ -3,7 +3,6 @@
 namespace FireflyIII\Http\Requests;
 
 use Auth;
-use FireflyIII\Models\Account;
 
 /**
  * Class ProfileFormRequest
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index e7c8505580..c92888c235 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -1,8 +1,6 @@
 <?php namespace FireflyIII\Providers;
 
-use App;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\Bill;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\LimitRepetition;
 use FireflyIII\Models\PiggyBank;
diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php
index be17996e38..5c3ae40886 100644
--- a/app/Repositories/Journal/JournalRepository.php
+++ b/app/Repositories/Journal/JournalRepository.php
@@ -11,7 +11,6 @@ use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use Illuminate\Support\Collection;
-use Log;
 
 /**
  * Class JournalRepository
@@ -275,7 +274,7 @@ class JournalRepository implements JournalRepositoryInterface
                 $transaction->save();
             }
             if (floatval($transaction->amount) > 0) {
-                $transaction->amount = $data['amount'];
+                $transaction->amount     = $data['amount'];
                 $transaction->account_id = $to->id;
                 $transaction->save();
             }
diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.php
index fa4ace8d68..451b999909 100644
--- a/app/Repositories/PiggyBank/PiggyBankRepository.php
+++ b/app/Repositories/PiggyBank/PiggyBankRepository.php
@@ -6,7 +6,6 @@ use Auth;
 use DB;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\PiggyBankRepetition;
-use FireflyIII\Models\Reminder;
 use Illuminate\Support\Collection;
 use Navigation;
 
diff --git a/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php b/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php
index a763e5bfba..f2577e2a4b 100644
--- a/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php
+++ b/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php
@@ -4,9 +4,7 @@ namespace FireflyIII\Repositories\PiggyBank;
 
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\PiggyBankRepetition;
-use FireflyIII\Models\Reminder;
 use Illuminate\Support\Collection;
-use Carbon\Carbon;
 
 /**
  * Interface PiggyBankRepositoryInterface
@@ -39,6 +37,7 @@ interface PiggyBankRepositoryInterface
 
     /**
      * Set all piggy banks to order 0.
+     *
      * @return void
      */
     public function reset();
@@ -55,7 +54,6 @@ interface PiggyBankRepositoryInterface
     public function setOrder($id, $order);
 
 
-
     /**
      * @param array $data
      *
diff --git a/bootstrap/app.php b/bootstrap/app.php
index e3697dc4ad..e3ec5b5519 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -11,10 +11,8 @@
 |
 */
 
-use FireflyIII\Validation\FireflyValidator;
-
 $app = new Illuminate\Foundation\Application(
-	realpath(__DIR__.'/../')
+    realpath(__DIR__ . '/../')
 );
 
 /*
@@ -29,18 +27,18 @@ $app = new Illuminate\Foundation\Application(
 */
 
 $app->singleton(
-	'Illuminate\Contracts\Http\Kernel',
-	'FireflyIII\Http\Kernel'
+    'Illuminate\Contracts\Http\Kernel',
+    'FireflyIII\Http\Kernel'
 );
 
 $app->singleton(
-	'Illuminate\Contracts\Console\Kernel',
-	'FireflyIII\Console\Kernel'
+    'Illuminate\Contracts\Console\Kernel',
+    'FireflyIII\Console\Kernel'
 );
 
 $app->singleton(
-	'Illuminate\Contracts\Debug\ExceptionHandler',
-	'FireflyIII\Exceptions\Handler'
+    'Illuminate\Contracts\Debug\ExceptionHandler',
+    'FireflyIII\Exceptions\Handler'
 );
 
 /*
diff --git a/database/seeds/TestDataSeeder.php b/database/seeds/TestDataSeeder.php
index 6ab7fad298..7a990553c1 100644
--- a/database/seeds/TestDataSeeder.php
+++ b/database/seeds/TestDataSeeder.php
@@ -9,8 +9,6 @@ use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\Category;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\PiggyBankEvent;
-use FireflyIII\Models\PiggyBankRepetition;
-use FireflyIII\Models\Reminder;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionGroup;