diff --git a/modules/backend/behaviors/ListController.php b/modules/backend/behaviors/ListController.php
index cf4896123..44c5005f1 100644
--- a/modules/backend/behaviors/ListController.php
+++ b/modules/backend/behaviors/ListController.php
@@ -15,7 +15,6 @@ use Backend\Classes\ControllerBehavior;
  */
 class ListController extends ControllerBehavior
 {
-
     /**
      * @var array List definitions, keys for alias and value for configuration.
      */
diff --git a/modules/backend/classes/BackendHelper.php b/modules/backend/classes/BackendHelper.php
index e48701bfe..f07637c81 100644
--- a/modules/backend/classes/BackendHelper.php
+++ b/modules/backend/classes/BackendHelper.php
@@ -13,7 +13,6 @@ use October\Rain\Router\Helper as RouterHelper;
  */
 class BackendHelper
 {
-
     /**
      * Returns a URL in context of the Backend
      */
diff --git a/modules/backend/classes/FormTabs.php b/modules/backend/classes/FormTabs.php
index 3a2e22804..0dab4e06a 100644
--- a/modules/backend/classes/FormTabs.php
+++ b/modules/backend/classes/FormTabs.php
@@ -16,7 +16,6 @@ use ArrayAccess;
  */
 class FormTabs implements IteratorAggregate, ArrayAccess
 {
-
     const SECTION_OUTSIDE = 'outside';
     const SECTION_PRIMARY = 'primary';
     const SECTION_SECONDARY = 'secondary';
@@ -176,5 +175,4 @@ class FormTabs implements IteratorAggregate, ArrayAccess
     {
         return isset($this->fields[$offset]) ? $this->fields[$offset] : null;
     }
-
-}
\ No newline at end of file
+}
diff --git a/modules/backend/classes/FormWidgetBase.php b/modules/backend/classes/FormWidgetBase.php
index 5a5748e1b..e59458c50 100644
--- a/modules/backend/classes/FormWidgetBase.php
+++ b/modules/backend/classes/FormWidgetBase.php
@@ -11,7 +11,6 @@ use Str;
  */
 abstract class FormWidgetBase extends WidgetBase
 {
-
     /**
      * @var FormField Object containing general form field information.
      */
diff --git a/modules/backend/classes/ListColumn.php b/modules/backend/classes/ListColumn.php
index 6cf0a32bb..afc44cec5 100644
--- a/modules/backend/classes/ListColumn.php
+++ b/modules/backend/classes/ListColumn.php
@@ -9,7 +9,6 @@
  */
 class ListColumn
 {
-
     /**
      * @var string List column name.
      */
diff --git a/modules/backend/classes/WidgetBase.php b/modules/backend/classes/WidgetBase.php
index 763f6ed72..40016f78a 100644
--- a/modules/backend/classes/WidgetBase.php
+++ b/modules/backend/classes/WidgetBase.php
@@ -13,7 +13,6 @@ use Session;
  */
 abstract class WidgetBase
 {
-
     use \System\Traits\AssetMaker;
     use \System\Traits\ConfigMaker;
     use \System\Traits\ViewMaker;
diff --git a/modules/backend/controllers/AccessLogs.php b/modules/backend/controllers/AccessLogs.php
index 6dd8dc476..1c1bd7617 100644
--- a/modules/backend/controllers/AccessLogs.php
+++ b/modules/backend/controllers/AccessLogs.php
@@ -21,7 +21,6 @@ use Exception;
  */
 class AccessLogs extends Controller
 {
-
     public $implement = [
         'Backend.Behaviors.ListController'
     ];
diff --git a/modules/backend/controllers/EditorPreferences.php b/modules/backend/controllers/EditorPreferences.php
index 459aa91fc..b1e0f52ab 100644
--- a/modules/backend/controllers/EditorPreferences.php
+++ b/modules/backend/controllers/EditorPreferences.php
@@ -14,7 +14,6 @@ use Backend\Models\EditorPreferences as EditorPreferencesModel;
  */
 class EditorPreferences extends Controller
 {
-
     public $implement = [
         'Backend.Behaviors.FormController',
     ];
diff --git a/modules/backend/routes.php b/modules/backend/routes.php
index 56ef8a3e1..63b93c388 100644
--- a/modules/backend/routes.php
+++ b/modules/backend/routes.php
@@ -1,10 +1,9 @@
 <?php
 
-/*
+/**
  * Register Backend routes before all user routes.
  */
 App::before(function ($request) {
-
     /*
      * Other pages
      */
@@ -16,5 +15,4 @@ App::before(function ($request) {
      * Entry point
      */
     Route::any(Config::get('cms.backendUri', 'backend'), 'Backend\Classes\BackendController@run');
-
 });
diff --git a/modules/cms/classes/CmsException.php b/modules/cms/classes/CmsException.php
index ef236fbc6..f85f7cac3 100644
--- a/modules/cms/classes/CmsException.php
+++ b/modules/cms/classes/CmsException.php
@@ -16,7 +16,6 @@ use Exception;
  */
 class CmsException extends ApplicationException
 {
-
     /**
      * @var Cms\Classes\CmsCompoundObject A reference to a CMS object used for masking errors.
      */
diff --git a/modules/cms/classes/CmsObjectQuery.php b/modules/cms/classes/CmsObjectQuery.php
index 2308213a3..a30dd441a 100644
--- a/modules/cms/classes/CmsObjectQuery.php
+++ b/modules/cms/classes/CmsObjectQuery.php
@@ -10,7 +10,6 @@ use System\Classes\ApplicationException;
  */
 class CmsObjectQuery
 {
-
     protected $useCache = false;
 
     protected $cmsObject;
diff --git a/modules/cms/routes.php b/modules/cms/routes.php
index 3667a5f22..5e84b32a6 100644
--- a/modules/cms/routes.php
+++ b/modules/cms/routes.php
@@ -1,14 +1,12 @@
 <?php
 
-/*
+/**
  * Register CMS routes before all user routes.
  */
 App::before(function ($request) {
-
     /*
-     * The CMS module intercepts all URLs that were not 
+     * The CMS module intercepts all URLs that were not
      * handled by the back-end modules.
      */
     Route::any('{slug}', 'Cms\Classes\Controller@run')->where('slug', '(.*)?');
-
 });
diff --git a/modules/system/classes/Controller.php b/modules/system/classes/Controller.php
index ae68562b3..d1ed59eb5 100644
--- a/modules/system/classes/Controller.php
+++ b/modules/system/classes/Controller.php
@@ -13,7 +13,6 @@ use Exception;
  */
 class Controller extends BaseController
 {
-
     /**
      * Combines JavaScript and StyleSheet assets.
      * @param string $name Combined file code
diff --git a/modules/system/classes/ErrorHandler.php b/modules/system/classes/ErrorHandler.php
index 2e572dda7..40912e107 100644
--- a/modules/system/classes/ErrorHandler.php
+++ b/modules/system/classes/ErrorHandler.php
@@ -19,7 +19,6 @@ use System\Classes\ApplicationException;
  */
 class ErrorHandler
 {
-
     /**
      * @var System\Classes\ExceptionBase A prepared mask exception used to mask any exception fired.
      */
diff --git a/modules/system/classes/ExceptionBase.php b/modules/system/classes/ExceptionBase.php
index 09818c6e0..b25a3f834 100644
--- a/modules/system/classes/ExceptionBase.php
+++ b/modules/system/classes/ExceptionBase.php
@@ -16,7 +16,6 @@ use System\Classes\ApplicationException;
  */
 class ExceptionBase extends Exception
 {
-
     /**
      * @var Exception If this exception is acting as a mask, this property stores the face exception.
      */
diff --git a/modules/system/classes/ModelBehavior.php b/modules/system/classes/ModelBehavior.php
index 2959a0b13..60301b5bb 100644
--- a/modules/system/classes/ModelBehavior.php
+++ b/modules/system/classes/ModelBehavior.php
@@ -12,7 +12,6 @@ use October\Rain\Database\ModelBehavior as ModelBehaviorBase;
  */
 class ModelBehavior extends ModelBehaviorBase
 {
-
     /**
      * @var array Properties that must exist in the model using this behavior.
      */
@@ -29,7 +28,8 @@ class ModelBehavior extends ModelBehaviorBase
         /*
          * Validate model properties
          */
-        foreach ($this->requiredProperties as $property) {
+        foreach ($this->requiredProperties as $property)
+        {
             if (!isset($model->{$property})) {
                 throw new ApplicationException(Lang::get('system::lang.behavior.missing_property', [
                     'class' => get_class($model),
diff --git a/modules/system/controllers/EventLogs.php b/modules/system/controllers/EventLogs.php
index bc50755cd..37b37e803 100644
--- a/modules/system/controllers/EventLogs.php
+++ b/modules/system/controllers/EventLogs.php
@@ -18,11 +18,9 @@ use Exception;
  *
  * @package october\system
  * @author Alexey Bobkov, Samuel Georges
- *
  */
 class EventLogs extends Controller
 {
-
     public $implement = [
         'Backend.Behaviors.FormController',
         'Backend.Behaviors.ListController'
diff --git a/modules/system/controllers/MailLayouts.php b/modules/system/controllers/MailLayouts.php
index 17885ce76..cfff5c42f 100644
--- a/modules/system/controllers/MailLayouts.php
+++ b/modules/system/controllers/MailLayouts.php
@@ -17,11 +17,9 @@ use Exception;
  *
  * @package october\system
  * @author Alexey Bobkov, Samuel Georges
- *
  */
 class MailLayouts extends Controller
 {
-
     public $implement = [
         'Backend.Behaviors.FormController',
     ];
diff --git a/modules/system/controllers/MailTemplates.php b/modules/system/controllers/MailTemplates.php
index b2caff856..e25f69d85 100644
--- a/modules/system/controllers/MailTemplates.php
+++ b/modules/system/controllers/MailTemplates.php
@@ -20,11 +20,9 @@ use Exception;
  *
  * @package october\system
  * @author Alexey Bobkov, Samuel Georges
- *
  */
 class MailTemplates extends Controller
 {
-
     public $implement = [
         'Backend.Behaviors.FormController',
         'Backend.Behaviors.ListController'
diff --git a/modules/system/controllers/RequestLogs.php b/modules/system/controllers/RequestLogs.php
index 23b4f4f18..f5348bdb9 100644
--- a/modules/system/controllers/RequestLogs.php
+++ b/modules/system/controllers/RequestLogs.php
@@ -18,11 +18,9 @@ use Exception;
  *
  * @package october\system
  * @author Alexey Bobkov, Samuel Georges
- *
  */
 class RequestLogs extends Controller
 {
-
     public $implement = [
         'Backend.Behaviors.FormController',
         'Backend.Behaviors.ListController'
diff --git a/modules/system/models/EventLog.php b/modules/system/models/EventLog.php
index f23cb81a9..d70f9fc32 100644
--- a/modules/system/models/EventLog.php
+++ b/modules/system/models/EventLog.php
@@ -11,7 +11,6 @@ use Model;
  */
 class EventLog extends Model
 {
-
     /**
      * @var string The database table used by the model.
      */
diff --git a/modules/system/models/RequestLog.php b/modules/system/models/RequestLog.php
index c6a9cc3a1..00a95971e 100644
--- a/modules/system/models/RequestLog.php
+++ b/modules/system/models/RequestLog.php
@@ -11,7 +11,6 @@ use Request;
  */
 class RequestLog extends Model
 {
-
     /**
      * @var string The database table used by the model.
      */
diff --git a/modules/system/routes.php b/modules/system/routes.php
index 4cf0d0b53..f1090b831 100644
--- a/modules/system/routes.php
+++ b/modules/system/routes.php
@@ -1,13 +1,11 @@
 <?php
 
-/*
+/**
  * Register System routes before all user routes.
  */
 App::before(function ($request) {
-
     /*
      * Combine JavaScript and StyleSheet assets
      */
     Route::any('combine/{file}', 'System\Classes\Controller@combine');
-
 });