diff --git a/app/Helpers/Report/ReportQuery.php b/app/Helpers/Report/ReportQuery.php
index 1807541a32..bec2475577 100644
--- a/app/Helpers/Report/ReportQuery.php
+++ b/app/Helpers/Report/ReportQuery.php
@@ -7,9 +7,7 @@ use Carbon\Carbon;
 use DB;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Budget;
-use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Query\JoinClause;
 use Illuminate\Support\Collection;
 
diff --git a/app/Helpers/Report/ReportQueryInterface.php b/app/Helpers/Report/ReportQueryInterface.php
index bd244a448b..45d910d46c 100644
--- a/app/Helpers/Report/ReportQueryInterface.php
+++ b/app/Helpers/Report/ReportQueryInterface.php
@@ -65,8 +65,8 @@ interface ReportQueryInterface
      * grouped by month like so: "2015-01" => '123.45'
      *
      * @param Collection $accounts
-     * @param Carbon $start
-     * @param Carbon $end
+     * @param Carbon     $start
+     * @param Carbon     $end
      *
      * @return array
      */
@@ -77,8 +77,8 @@ interface ReportQueryInterface
      * grouped by month like so: "2015-01" => '123.45'
      *
      * @param Collection $accounts
-     * @param Carbon $start
-     * @param Carbon $end
+     * @param Carbon     $start
+     * @param Carbon     $end
      *
      * @return array
      */
diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index d80f2a021b..44f7e7e396 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -195,7 +195,7 @@ class AccountController extends Controller
         $subTitleIcon = Config::get('firefly.subTitlesByIdentifier.' . $account->accountType->type);
         $what         = Config::get('firefly.shortNamesByFullName.' . $account->accountType->type);
         $journals     = $repository->getJournals($account, $page);
-        $subTitle = trans('firefly.details_for_' . $what, ['name' => $account->name]);
+        $subTitle     = trans('firefly.details_for_' . $what, ['name' => $account->name]);
         $journals->setPath('accounts/show/' . $account->id);
 
 
diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php
index fb07d200b3..e680e5e2c5 100644
--- a/app/Http/Controllers/BudgetController.php
+++ b/app/Http/Controllers/BudgetController.php
@@ -234,8 +234,8 @@ class BudgetController extends Controller
 
         if (is_null($repetition->id)) {
             $start = $repository->firstActivity($budget);
-            $end = new Carbon;
-            $set = $budget->limitrepetitions()->orderBy('startdate','DESC')->get();
+            $end   = new Carbon;
+            $set   = $budget->limitrepetitions()->orderBy('startdate', 'DESC')->get();
             //$set      = $repository->getBudgetLimits($budget);
             //$subTitle = e($budget->name);
         } else {
diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php
index 64ccd5c591..39d3c4dffa 100644
--- a/app/Http/Controllers/Chart/BudgetController.php
+++ b/app/Http/Controllers/Chart/BudgetController.php
@@ -227,9 +227,9 @@ class BudgetController extends Controller
     /**
      * Shows a budget list with spent/left/overspent.
      *
-     * @param BudgetRepositoryInterface  $repository
+     * @param BudgetRepositoryInterface $repository
      *
-     * @param ARI $accountRepository
+     * @param ARI                       $accountRepository
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
diff --git a/app/Http/Controllers/Chart/CategoryController.php b/app/Http/Controllers/Chart/CategoryController.php
index 0b75b0b328..d2adca7078 100644
--- a/app/Http/Controllers/Chart/CategoryController.php
+++ b/app/Http/Controllers/Chart/CategoryController.php
@@ -461,5 +461,4 @@ class CategoryController extends Controller
     }
 
 
-
 }
diff --git a/app/Http/Controllers/NewUserController.php b/app/Http/Controllers/NewUserController.php
index 384223dc1b..440c5c74d0 100644
--- a/app/Http/Controllers/NewUserController.php
+++ b/app/Http/Controllers/NewUserController.php
@@ -6,7 +6,7 @@ use Config;
 use FireflyIII\Http\Requests\NewUserFormRequest;
 use FireflyIII\Models\AccountMeta;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
-use Preferences ;
+use Preferences;
 use Session;
 use View;
 
@@ -42,8 +42,8 @@ class NewUserController extends Controller
     }
 
     /**
-     * @param NewUserFormRequest         $request
-     * @param ARI $repository
+     * @param NewUserFormRequest $request
+     * @param ARI                $repository
      *
      * @return \Illuminate\Http\RedirectResponse
      */
diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php
index 40c43481a8..8b431fdd72 100644
--- a/app/Http/Controllers/PiggyBankController.php
+++ b/app/Http/Controllers/PiggyBankController.php
@@ -40,8 +40,8 @@ class PiggyBankController extends Controller
     /**
      * Add money to piggy bank
      *
-     * @param ARI $repository
-     * @param PiggyBank                  $piggyBank
+     * @param ARI       $repository
+     * @param PiggyBank $piggyBank
      *
      * @return $this
      */
@@ -116,8 +116,8 @@ class PiggyBankController extends Controller
     }
 
     /**
-     * @param ARI $repository
-     * @param PiggyBank                  $piggyBank
+     * @param ARI       $repository
+     * @param PiggyBank $piggyBank
      *
      * @return View
      */
@@ -219,7 +219,7 @@ class PiggyBankController extends Controller
 
     /**
      * @param PiggyBankRepositoryInterface $repository
-     * @param ARI   $accounts
+     * @param ARI                          $accounts
      * @param PiggyBank                    $piggyBank
      *
      * @return \Illuminate\Http\RedirectResponse
diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php
index 1ed7e5a78a..60712a986e 100644
--- a/app/Http/Controllers/TransactionController.php
+++ b/app/Http/Controllers/TransactionController.php
@@ -43,8 +43,8 @@ class TransactionController extends Controller
     }
 
     /**
-     * @param ARI $repository
-     * @param string                     $what
+     * @param ARI    $repository
+     * @param string $what
      *
      * @return \Illuminate\View\View
      */
@@ -133,8 +133,8 @@ class TransactionController extends Controller
     /**
      * Shows the view to edit a transaction.
      *
-     * @param ARI $repository
-     * @param TransactionJournal         $journal
+     * @param ARI                $repository
+     * @param TransactionJournal $journal
      *
      * @return $this
      */
diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php
index 90eb46cd13..10d2a1bab2 100644
--- a/app/Repositories/Account/AccountRepository.php
+++ b/app/Repositories/Account/AccountRepository.php
@@ -270,7 +270,7 @@ class AccountRepository implements AccountRepositoryInterface
         $end        = clone Session::get('end', new Carbon);
         $collection = new Collection(DB::table('piggy_banks')->distinct()->get(['piggy_banks.account_id']));
         $ids        = $collection->pluck('account_id')->toArray();
-        $accounts = new Collection;
+        $accounts   = new Collection;
 
         $cache = new CacheProperties;
         $cache->addProperty($ids);
diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php
index cfcbf75359..830bbb9167 100644
--- a/app/Repositories/Budget/BudgetRepository.php
+++ b/app/Repositories/Budget/BudgetRepository.php
@@ -206,7 +206,8 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
      *
      * @return Collection
      */
-    public function getBudgetReps(Budget $budget) {
+    public function getBudgetReps(Budget $budget)
+    {
         $set = $budget->limitrepetitions()->count();
         var_dump($set);
     }
diff --git a/app/Repositories/Category/SingleCategoryRepository.php b/app/Repositories/Category/SingleCategoryRepository.php
index 41b237a07f..1f56c180d2 100644
--- a/app/Repositories/Category/SingleCategoryRepository.php
+++ b/app/Repositories/Category/SingleCategoryRepository.php
@@ -2,7 +2,6 @@
 
 namespace FireflyIII\Repositories\Category;
 
-use Auth;
 use Carbon\Carbon;
 use DB;
 use FireflyIII\Models\Category;
@@ -108,12 +107,12 @@ class SingleCategoryRepository extends ComponentRepository implements SingleCate
     {
         /** @var Collection $query */
         $query = $category->transactionJournals()
-                     ->transactionTypes([TransactionType::DEPOSIT])
-                     ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                     ->where('transactions.amount', '>', 0)
-                     ->before($end)
-                     ->after($start)
-                     ->groupBy('date')->get(['transaction_journals.date as dateFormatted', DB::Raw('SUM(`transactions`.`amount`) AS `sum`')]);
+                          ->transactionTypes([TransactionType::DEPOSIT])
+                          ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                          ->where('transactions.amount', '>', 0)
+                          ->before($end)
+                          ->after($start)
+                          ->groupBy('date')->get(['transaction_journals.date as dateFormatted', DB::Raw('SUM(`transactions`.`amount`) AS `sum`')]);
 
         $return = [];
         foreach ($query->toArray() as $entry) {
@@ -244,12 +243,12 @@ class SingleCategoryRepository extends ComponentRepository implements SingleCate
     {
         /** @var Collection $query */
         $query = $category->transactionJournals()
-                     ->transactionTypes([TransactionType::WITHDRAWAL])
-                     ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                     ->where('transactions.amount', '<', 0)
-                     ->before($end)
-                     ->after($start)
-                     ->groupBy('date')->get(['transaction_journals.date as dateFormatted', DB::Raw('SUM(`transactions`.`amount`) AS `sum`')]);
+                          ->transactionTypes([TransactionType::WITHDRAWAL])
+                          ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                          ->where('transactions.amount', '<', 0)
+                          ->before($end)
+                          ->after($start)
+                          ->groupBy('date')->get(['transaction_journals.date as dateFormatted', DB::Raw('SUM(`transactions`.`amount`) AS `sum`')]);
 
         $return = [];
         foreach ($query->toArray() as $entry) {
diff --git a/app/Repositories/Shared/ComponentRepository.php b/app/Repositories/Shared/ComponentRepository.php
index 6731c904cb..7c976e8784 100644
--- a/app/Repositories/Shared/ComponentRepository.php
+++ b/app/Repositories/Shared/ComponentRepository.php
@@ -4,7 +4,6 @@ namespace FireflyIII\Repositories\Shared;
 
 use Carbon\Carbon;
 use DB;
-use FireflyIII\Models\Account;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Support\Collection;
diff --git a/app/Sql/Query.php b/app/Sql/Query.php
index 9f31ad83fe..b0989a82d7 100644
--- a/app/Sql/Query.php
+++ b/app/Sql/Query.php
@@ -11,7 +11,7 @@ namespace FireflyIII\Sql;
  */
 class Query
 {
-    const SPENT = 1;
+    const SPENT  = 1;
     const EARNED = 2;
 
 }
\ No newline at end of file