diff --git a/app/Handlers/Events/UpdateJournalConnection.php b/app/Handlers/Events/UpdateJournalConnection.php
index 20803aacf4..f18f0bf17e 100644
--- a/app/Handlers/Events/UpdateJournalConnection.php
+++ b/app/Handlers/Events/UpdateJournalConnection.php
@@ -2,7 +2,6 @@
 
 use FireflyIII\Events\JournalSaved;
 use FireflyIII\Models\PiggyBankEvent;
-use FireflyIII\Models\Transaction;
 
 /**
  * Class UpdateJournalConnection
diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php
index 5dcca9fc59..27205a295b 100644
--- a/app/Http/Controllers/BudgetController.php
+++ b/app/Http/Controllers/BudgetController.php
@@ -5,7 +5,6 @@ use Carbon\Carbon;
 use FireflyIII\Http\Requests;
 use FireflyIII\Http\Requests\BudgetFormRequest;
 use FireflyIII\Models\Budget;
-use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\LimitRepetition;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use Input;
diff --git a/app/Http/Controllers/JsonController.php b/app/Http/Controllers/JsonController.php
index 02c326d2fd..43863523c9 100644
--- a/app/Http/Controllers/JsonController.php
+++ b/app/Http/Controllers/JsonController.php
@@ -6,8 +6,6 @@ use FireflyIII\Helpers\Report\ReportQueryInterface;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\Preference;
-use FireflyIII\Models\Transaction;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
@@ -187,25 +185,6 @@ class JsonController extends Controller
 
     }
 
-    /**
-     * Returns a JSON list of all beneficiaries.
-     *
-     * @param TagRepositoryInterface $tagRepository
-     *
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function tags(TagRepositoryInterface $tagRepository)
-    {
-        $list   = $tagRepository->get();
-        $return = [];
-        foreach ($list as $entry) {
-            $return[] = $entry->tag;
-        }
-
-        return Response::json($return);
-
-    }
-
     /**
      * @param AccountRepositoryInterface $accountRepository
      *
@@ -247,6 +226,25 @@ class JsonController extends Controller
         return Response::json(['value' => $pref->data]);
     }
 
+    /**
+     * Returns a JSON list of all beneficiaries.
+     *
+     * @param TagRepositoryInterface $tagRepository
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function tags(TagRepositoryInterface $tagRepository)
+    {
+        $list   = $tagRepository->get();
+        $return = [];
+        foreach ($list as $entry) {
+            $return[] = $entry->tag;
+        }
+
+        return Response::json($return);
+
+    }
+
     /**
      * @param JournalRepositoryInterface $repository
      * @param                            $what
diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php
index 6799f4d8d3..8ffa215491 100644
--- a/app/Http/Controllers/PiggyBankController.php
+++ b/app/Http/Controllers/PiggyBankController.php
@@ -6,9 +6,7 @@ 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;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use Illuminate\Support\Collection;
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index a9d54e9e0f..0c85491199 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -1,7 +1,6 @@
 <?php namespace FireflyIII\Providers;
 
 use FireflyIII\Models\Account;
-use FireflyIII\Models\Bill;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\LimitRepetition;
 use FireflyIII\Models\PiggyBank;
diff --git a/app/Providers/FireflyServiceProvider.php b/app/Providers/FireflyServiceProvider.php
index 36c32de527..c4d042b13e 100644
--- a/app/Providers/FireflyServiceProvider.php
+++ b/app/Providers/FireflyServiceProvider.php
@@ -3,7 +3,6 @@
 namespace FireflyIII\Providers;
 
 use App;
-use FireflyIII\Models\Account;
 use FireflyIII\Support\Amount;
 use FireflyIII\Support\ExpandedForm;
 use FireflyIII\Support\Navigation;
diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php
index 58d30446e1..41fabfceec 100644
--- a/app/Repositories/Bill/BillRepository.php
+++ b/app/Repositories/Bill/BillRepository.php
@@ -212,7 +212,7 @@ class BillRepository implements BillRepositoryInterface
          * when the current period has a transaction journal.
          */
         /** @var \Carbon\Carbon $obj */
-        $obj = new Carbon;
+        $obj   = new Carbon;
         $today = Navigation::addPeriod($obj, $bill->repeat_freq, 0);
 
         $skip  = $bill->skip + 1;
diff --git a/app/Repositories/Category/CategoryRepositoryInterface.php b/app/Repositories/Category/CategoryRepositoryInterface.php
index 3cf025e354..30456995a1 100644
--- a/app/Repositories/Category/CategoryRepositoryInterface.php
+++ b/app/Repositories/Category/CategoryRepositoryInterface.php
@@ -71,9 +71,9 @@ interface CategoryRepositoryInterface
     public function getWithoutCategory(Carbon $start, Carbon $end);
 
     /**
-     * @param Category $category
-     * @param \Carbon\Carbon   $start
-     * @param \Carbon\Carbon   $end
+     * @param Category       $category
+     * @param \Carbon\Carbon $start
+     * @param \Carbon\Carbon $end
      *
      * @return float
      */
diff --git a/app/Support/ExpandedForm.php b/app/Support/ExpandedForm.php
index a28c87ba02..35eb8855b9 100644
--- a/app/Support/ExpandedForm.php
+++ b/app/Support/ExpandedForm.php
@@ -3,7 +3,6 @@
 namespace FireflyIII\Support;
 
 use Amount as Amt;
-use FireflyIII\Models\TransactionCurrency;
 use Illuminate\Support\Collection;
 use Illuminate\Support\MessageBag;
 use Input;
diff --git a/app/Support/Navigation.php b/app/Support/Navigation.php
index 69025ba3b2..470089f369 100644
--- a/app/Support/Navigation.php
+++ b/app/Support/Navigation.php
@@ -384,7 +384,7 @@ class Navigation
     }
 
     /**
-     * @param        $range
+     * @param                $range
      * @param \Carbon\Carbon $start
      *
      * @return \Carbon\Carbon
diff --git a/app/Support/Search/Search.php b/app/Support/Search/Search.php
index e07e538ecf..a493ad0741 100644
--- a/app/Support/Search/Search.php
+++ b/app/Support/Search/Search.php
@@ -121,6 +121,7 @@ class Search implements SearchInterface
                         return $journal;
                     }
                 }
+
                 return null;
 
             }
diff --git a/app/Support/Steam.php b/app/Support/Steam.php
index 8206024886..22fa07e211 100644
--- a/app/Support/Steam.php
+++ b/app/Support/Steam.php
@@ -18,8 +18,8 @@ class Steam
     /**
      *
      * @param \FireflyIII\Models\Account $account
-     * @param \Carbon\Carbon  $date
-     * @param bool    $ignoreVirtualBalance
+     * @param \Carbon\Carbon             $date
+     * @param bool                       $ignoreVirtualBalance
      *
      * @return float
      */
diff --git a/app/Support/Twig/Journal.php b/app/Support/Twig/Journal.php
index aa56a310c0..bb63d656c4 100644
--- a/app/Support/Twig/Journal.php
+++ b/app/Support/Twig/Journal.php
@@ -39,6 +39,7 @@ class Journal extends Twig_Extension
             if ($type == 'Opening balance') {
                 return '<span class="glyphicon glyphicon-ban-circle" title="Opening balance"></span>';
             }
+
             return '';
 
         }, ['is_safe' => ['html']]