diff --git a/app/Providers/AccountServiceProvider.php b/app/Providers/AccountServiceProvider.php
index 9f0041a758..40e60542a2 100644
--- a/app/Providers/AccountServiceProvider.php
+++ b/app/Providers/AccountServiceProvider.php
@@ -35,10 +35,9 @@ class AccountServiceProvider extends ServiceProvider
             function (Application $app, array $arguments) {
                 if (!isset($arguments[0]) && $app->auth->check()) {
                     return app('FireflyIII\Repositories\Account\AccountRepository', [$app->auth->user()]);
-                } else {
-                    if (!isset($arguments[0]) && !$app->auth->check()) {
-                        throw new FireflyException('There is no user present.');
-                    }
+                }
+                if (!isset($arguments[0]) && !$app->auth->check()) {
+                    throw new FireflyException('There is no user present.');
                 }
 
                 return app('FireflyIII\Repositories\Account\AccountRepository', $arguments);
diff --git a/app/Providers/AttachmentServiceProvider.php b/app/Providers/AttachmentServiceProvider.php
index e0da2cd9e9..a9b543030d 100644
--- a/app/Providers/AttachmentServiceProvider.php
+++ b/app/Providers/AttachmentServiceProvider.php
@@ -35,10 +35,9 @@ class AttachmentServiceProvider extends ServiceProvider
             function (Application $app, array $arguments) {
                 if (!isset($arguments[0]) && $app->auth->check()) {
                     return app('FireflyIII\Repositories\Attachment\AttachmentRepository', [$app->auth->user()]);
-                } else {
-                    if (!isset($arguments[0]) && !$app->auth->check()) {
-                        throw new FireflyException('There is no user present.');
-                    }
+                }
+                if (!isset($arguments[0]) && !$app->auth->check()) {
+                    throw new FireflyException('There is no user present.');
                 }
 
                 return app('FireflyIII\Repositories\Attachment\AttachmentRepository', $arguments);
diff --git a/app/Providers/BillServiceProvider.php b/app/Providers/BillServiceProvider.php
index c6de019fdb..e0301b5e6a 100644
--- a/app/Providers/BillServiceProvider.php
+++ b/app/Providers/BillServiceProvider.php
@@ -35,10 +35,9 @@ class BillServiceProvider extends ServiceProvider
             function (Application $app, array $arguments) {
                 if (!isset($arguments[0]) && $app->auth->check()) {
                     return app('FireflyIII\Repositories\Bill\BillRepository', [$app->auth->user()]);
-                } else {
-                    if (!isset($arguments[0]) && !$app->auth->check()) {
-                        throw new FireflyException('There is no user present.');
-                    }
+                }
+                if (!isset($arguments[0]) && !$app->auth->check()) {
+                    throw new FireflyException('There is no user present.');
                 }
 
                 return app('FireflyIII\Repositories\Bill\BillRepository', $arguments);
diff --git a/app/Providers/BudgetServiceProvider.php b/app/Providers/BudgetServiceProvider.php
index 60cb44b5fe..b5eac92ff6 100644
--- a/app/Providers/BudgetServiceProvider.php
+++ b/app/Providers/BudgetServiceProvider.php
@@ -35,10 +35,9 @@ class BudgetServiceProvider extends ServiceProvider
             function (Application $app, array $arguments) {
                 if (!isset($arguments[0]) && $app->auth->check()) {
                     return app('FireflyIII\Repositories\Budget\BudgetRepository', [$app->auth->user()]);
-                } else {
-                    if (!isset($arguments[0]) && !$app->auth->check()) {
-                        throw new FireflyException('There is no user present.');
-                    }
+                }
+                if (!isset($arguments[0]) && !$app->auth->check()) {
+                    throw new FireflyException('There is no user present.');
                 }
 
                 return app('FireflyIII\Repositories\Budget\BudgetRepository', $arguments);
diff --git a/app/Providers/CategoryServiceProvider.php b/app/Providers/CategoryServiceProvider.php
index c299e57c12..7da232890c 100644
--- a/app/Providers/CategoryServiceProvider.php
+++ b/app/Providers/CategoryServiceProvider.php
@@ -35,10 +35,9 @@ class CategoryServiceProvider extends ServiceProvider
             function (Application $app, array $arguments) {
                 if (!isset($arguments[0]) && $app->auth->check()) {
                     return app('FireflyIII\Repositories\Category\CategoryRepository', [$app->auth->user()]);
-                } else {
-                    if (!isset($arguments[0]) && !$app->auth->check()) {
-                        throw new FireflyException('There is no user present.');
-                    }
+                }
+                if (!isset($arguments[0]) && !$app->auth->check()) {
+                    throw new FireflyException('There is no user present.');
                 }
 
                 return app('FireflyIII\Repositories\Category\CategoryRepository', $arguments);
@@ -50,10 +49,9 @@ class CategoryServiceProvider extends ServiceProvider
             function (Application $app, array $arguments) {
                 if (!isset($arguments[0]) && $app->auth->check()) {
                     return app('FireflyIII\Repositories\Category\SingleCategoryRepository', [$app->auth->user()]);
-                } else {
-                    if (!isset($arguments[0]) && !$app->auth->check()) {
-                        throw new FireflyException('There is no user present.');
-                    }
+                }
+                if (!isset($arguments[0]) && !$app->auth->check()) {
+                    throw new FireflyException('There is no user present.');
                 }
 
                 return app('FireflyIII\Repositories\Category\SingleCategoryRepository', $arguments);
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 929c1d5a3a..b7e4b17ea0 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -86,13 +86,13 @@ class EventServiceProvider extends ServiceProvider
                     } catch (QueryException $e) {
                         Log::error('Trying to save new LimitRepetition failed: ' . $e->getMessage());
                     }
-                } else {
-                    if ($set->count() == 1) {
-                        $repetition         = $set->first();
-                        $repetition->amount = $budgetLimit->amount;
-                        $repetition->save();
+                }
+                
+                if ($set->count() == 1) {
+                    $repetition         = $set->first();
+                    $repetition->amount = $budgetLimit->amount;
+                    $repetition->save();
 
-                    }
                 }
             }
         );
diff --git a/app/Providers/ExportJobServiceProvider.php b/app/Providers/ExportJobServiceProvider.php
index fe4a5da13a..598af88f54 100644
--- a/app/Providers/ExportJobServiceProvider.php
+++ b/app/Providers/ExportJobServiceProvider.php
@@ -26,10 +26,9 @@ class ExportJobServiceProvider extends ServiceProvider
             function (Application $app, array $arguments) {
                 if (!isset($arguments[0]) && $app->auth->check()) {
                     return app('FireflyIII\Repositories\ExportJob\ExportJobRepository', [$app->auth->user()]);
-                } else {
-                    if (!isset($arguments[0]) && !$app->auth->check()) {
-                        throw new FireflyException('There is no user present.');
-                    }
+                }
+                if (!isset($arguments[0]) && !$app->auth->check()) {
+                    throw new FireflyException('There is no user present.');
                 }
 
                 return app('FireflyIII\Repositories\ExportJob\ExportJobRepository', $arguments);
diff --git a/app/Providers/FireflyServiceProvider.php b/app/Providers/FireflyServiceProvider.php
index 344d9b82a3..bcf28fdce8 100644
--- a/app/Providers/FireflyServiceProvider.php
+++ b/app/Providers/FireflyServiceProvider.php
@@ -34,10 +34,6 @@ class FireflyServiceProvider extends ServiceProvider
                 return new FireflyValidator($translator, $data, $rules, $messages);
             }
         );
-        /*
-         * Default Twig configuration:
-         */
-
         $config = app('config');
         Twig::addExtension(new Functions($config));
         Twig::addExtension(new PiggyBank);
@@ -53,7 +49,6 @@ class FireflyServiceProvider extends ServiceProvider
      */
     public function register()
     {
-
         $this->app->bind(
             'preferences', function () {
             return new Preferences;
@@ -81,18 +76,11 @@ class FireflyServiceProvider extends ServiceProvider
         }
         );
 
-
         $this->app->bind('FireflyIII\Repositories\Currency\CurrencyRepositoryInterface', 'FireflyIII\Repositories\Currency\CurrencyRepository');
         $this->app->bind('FireflyIII\Support\Search\SearchInterface', 'FireflyIII\Support\Search\Search');
         $this->app->bind('FireflyIII\Repositories\User\UserRepositoryInterface', 'FireflyIII\Repositories\User\UserRepository');
-
-        // CSV import
         $this->app->bind('FireflyIII\Helpers\Csv\WizardInterface', 'FireflyIII\Helpers\Csv\Wizard');
-
-        // attachments
         $this->app->bind('FireflyIII\Helpers\Attachments\AttachmentHelperInterface', 'FireflyIII\Helpers\Attachments\AttachmentHelper');
-
-        // make charts:
         $this->app->bind(
             'FireflyIII\Generator\Chart\Account\AccountChartGeneratorInterface', 'FireflyIII\Generator\Chart\Account\ChartJsAccountChartGenerator'
         );
@@ -105,18 +93,13 @@ class FireflyServiceProvider extends ServiceProvider
             'FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGeneratorInterface', 'FireflyIII\Generator\Chart\PiggyBank\ChartJsPiggyBankChartGenerator'
         );
         $this->app->bind('FireflyIII\Generator\Chart\Report\ReportChartGeneratorInterface', 'FireflyIII\Generator\Chart\Report\ChartJsReportChartGenerator');
-
-
         $this->app->bind('FireflyIII\Helpers\Help\HelpInterface', 'FireflyIII\Helpers\Help\Help');
         $this->app->bind('FireflyIII\Helpers\Report\ReportHelperInterface', 'FireflyIII\Helpers\Report\ReportHelper');
         $this->app->bind('FireflyIII\Helpers\Report\ReportQueryInterface', 'FireflyIII\Helpers\Report\ReportQuery');
         $this->app->bind('FireflyIII\Helpers\FiscalHelperInterface', 'FireflyIII\Helpers\FiscalHelper');
-
-        // better report helper interfaces:
         $this->app->bind('FireflyIII\Helpers\Report\AccountReportHelperInterface', 'FireflyIII\Helpers\Report\AccountReportHelper');
         $this->app->bind('FireflyIII\Helpers\Report\BalanceReportHelperInterface', 'FireflyIII\Helpers\Report\BalanceReportHelper');
         $this->app->bind('FireflyIII\Helpers\Report\BudgetReportHelperInterface', 'FireflyIII\Helpers\Report\BudgetReportHelper');
-
     }
 
 }
diff --git a/app/Providers/JournalServiceProvider.php b/app/Providers/JournalServiceProvider.php
index b11e176021..f1d6586082 100644
--- a/app/Providers/JournalServiceProvider.php
+++ b/app/Providers/JournalServiceProvider.php
@@ -35,10 +35,9 @@ class JournalServiceProvider extends ServiceProvider
             function (Application $app, array $arguments) {
                 if (!isset($arguments[0]) && $app->auth->check()) {
                     return app('FireflyIII\Repositories\Journal\JournalRepository', [$app->auth->user()]);
-                } else {
-                    if (!isset($arguments[0]) && !$app->auth->check()) {
-                        throw new FireflyException('There is no user present.');
-                    }
+                }
+                if (!isset($arguments[0]) && !$app->auth->check()) {
+                    throw new FireflyException('There is no user present.');
                 }
 
                 return app('FireflyIII\Repositories\Journal\JournalRepository', $arguments);
diff --git a/app/Providers/PiggyBankServiceProvider.php b/app/Providers/PiggyBankServiceProvider.php
index d8174a4a0c..83129510e3 100644
--- a/app/Providers/PiggyBankServiceProvider.php
+++ b/app/Providers/PiggyBankServiceProvider.php
@@ -36,10 +36,9 @@ class PiggyBankServiceProvider extends ServiceProvider
             function (Application $app, array $arguments) {
                 if (!isset($arguments[0]) && $app->auth->check()) {
                     return app('FireflyIII\Repositories\PiggyBank\PiggyBankRepository', [$app->auth->user()]);
-                } else {
-                    if (!isset($arguments[0]) && !$app->auth->check()) {
-                        throw new FireflyException('There is no user present.');
-                    }
+                }
+                if (!isset($arguments[0]) && !$app->auth->check()) {
+                    throw new FireflyException('There is no user present.');
                 }
 
                 return app('FireflyIII\Repositories\PiggyBank\PiggyBankRepository', $arguments);
diff --git a/app/Providers/RuleGroupServiceProvider.php b/app/Providers/RuleGroupServiceProvider.php
index ddea53d92a..e797814a5d 100644
--- a/app/Providers/RuleGroupServiceProvider.php
+++ b/app/Providers/RuleGroupServiceProvider.php
@@ -36,10 +36,9 @@ class RuleGroupServiceProvider extends ServiceProvider
             function (Application $app, array $arguments) {
                 if (!isset($arguments[0]) && $app->auth->check()) {
                     return app('FireflyIII\Repositories\RuleGroup\RuleGroupRepository', [$app->auth->user()]);
-                } else {
-                    if (!isset($arguments[0]) && !$app->auth->check()) {
-                        throw new FireflyException('There is no user present.');
-                    }
+                }
+                if (!isset($arguments[0]) && !$app->auth->check()) {
+                    throw new FireflyException('There is no user present.');
                 }
 
                 return app('FireflyIII\Repositories\RuleGroup\RuleGroupRepository', $arguments);
diff --git a/app/Providers/RuleServiceProvider.php b/app/Providers/RuleServiceProvider.php
index 38059ecd6f..be4e906cbe 100644
--- a/app/Providers/RuleServiceProvider.php
+++ b/app/Providers/RuleServiceProvider.php
@@ -35,10 +35,9 @@ class RuleServiceProvider extends ServiceProvider
             function (Application $app, array $arguments) {
                 if (!isset($arguments[0]) && $app->auth->check()) {
                     return app('FireflyIII\Repositories\Rule\RuleRepository', [$app->auth->user()]);
-                } else {
-                    if (!isset($arguments[0]) && !$app->auth->check()) {
-                        throw new FireflyException('There is no user present.');
-                    }
+                }
+                if (!isset($arguments[0]) && !$app->auth->check()) {
+                    throw new FireflyException('There is no user present.');
                 }
 
                 return app('FireflyIII\Repositories\Rule\RuleRepository', $arguments);
diff --git a/app/Providers/TagServiceProvider.php b/app/Providers/TagServiceProvider.php
index 0d59552cfc..50e97b313f 100644
--- a/app/Providers/TagServiceProvider.php
+++ b/app/Providers/TagServiceProvider.php
@@ -35,10 +35,9 @@ class TagServiceProvider extends ServiceProvider
             function (Application $app, array $arguments) {
                 if (!isset($arguments[0]) && $app->auth->check()) {
                     return app('FireflyIII\Repositories\Tag\TagRepository', [$app->auth->user()]);
-                } else {
-                    if (!isset($arguments[0]) && !$app->auth->check()) {
-                        throw new FireflyException('There is no user present.');
-                    }
+                }
+                if (!isset($arguments[0]) && !$app->auth->check()) {
+                    throw new FireflyException('There is no user present.');
                 }
 
                 return app('FireflyIII\Repositories\Tag\TagRepository', $arguments);