diff --git a/modules/backend/behaviors/FormController.php b/modules/backend/behaviors/FormController.php
index 1efe1a443..8cba49f65 100644
--- a/modules/backend/behaviors/FormController.php
+++ b/modules/backend/behaviors/FormController.php
@@ -436,8 +436,7 @@ class FormController extends ControllerBehavior
     protected function createModel()
     {
         $class = $this->config->modelClass;
-        $model = new $class;
-        return $model;
+        return new $class;
     }
 
     /**
diff --git a/modules/backend/behaviors/ImportExportController.php b/modules/backend/behaviors/ImportExportController.php
index 67676427d..a84a203d1 100644
--- a/modules/backend/behaviors/ImportExportController.php
+++ b/modules/backend/behaviors/ImportExportController.php
@@ -695,8 +695,7 @@ class ImportExportController extends ControllerBehavior
             $widgetConfig->alias = $type.'OptionsForm';
             $widgetConfig->arrayName = ucfirst($type).'Options';
 
-            $widget = $this->makeWidget('Backend\Widgets\Form', $widgetConfig);
-            return $widget;
+            return $this->makeWidget('Backend\Widgets\Form', $widgetConfig);
         }
 
         return null;
diff --git a/modules/backend/behaviors/RelationController.php b/modules/backend/behaviors/RelationController.php
index 3e14bd615..453aedcca 100644
--- a/modules/backend/behaviors/RelationController.php
+++ b/modules/backend/behaviors/RelationController.php
@@ -903,8 +903,7 @@ class RelationController extends ControllerBehavior
             $config->model->setRelation('pivot', $pivotModel);
         }
 
-        $widget = $this->makeWidget('Backend\Widgets\Form', $config);
-        return $widget;
+        return $this->makeWidget('Backend\Widgets\Form', $config);
     }
 
     //
diff --git a/modules/backend/models/BrandSetting.php b/modules/backend/models/BrandSetting.php
index 4682ee436..389f12d12 100644
--- a/modules/backend/models/BrandSetting.php
+++ b/modules/backend/models/BrandSetting.php
@@ -131,9 +131,7 @@ class BrandSetting extends Model
             self::get('custom_css')
         );
 
-        $css = $parser->getCss();
-
-        return $css;
+        return $parser->getCss();
     }
 
     //
diff --git a/modules/backend/models/EditorSetting.php b/modules/backend/models/EditorSetting.php
index 5429b20a9..9dc9d86ec 100644
--- a/modules/backend/models/EditorSetting.php
+++ b/modules/backend/models/EditorSetting.php
@@ -182,8 +182,6 @@ class EditorSetting extends Model
 
         $parser->parse($customStyles);
 
-        $css = $parser->getCss();
-
-        return $css;
+        return $parser->getCss();
     }
 }
diff --git a/modules/backend/widgets/Form.php b/modules/backend/widgets/Form.php
index 2dc30ab48..353390040 100644
--- a/modules/backend/widgets/Form.php
+++ b/modules/backend/widgets/Form.php
@@ -947,8 +947,7 @@ class Form extends WidgetBase
         }
 
         if ($field->type === 'widget') {
-            $widget = $this->makeFormFieldWidget($field);
-            return $widget->showLabels;
+            return $this->makeFormFieldWidget($field)->showLabels;
         }
 
         return true;
diff --git a/modules/backend/widgets/MediaManager.php b/modules/backend/widgets/MediaManager.php
index 1ee174162..3910d2815 100644
--- a/modules/backend/widgets/MediaManager.php
+++ b/modules/backend/widgets/MediaManager.php
@@ -683,9 +683,7 @@ class MediaManager extends WidgetBase
 
     protected function getCurrentFolder()
     {
-        $folder = $this->getSession('media_folder', self::FOLDER_ROOT);
-
-        return $folder;
+        return $this->getSession('media_folder', self::FOLDER_ROOT);
     }
 
     protected function setFilter($filter)
@@ -899,9 +897,7 @@ class MediaManager extends WidgetBase
 
         $partition = implode('/', array_slice(str_split($itemSignature, 3), 0, 3)) . '/';
 
-        $result = $this->getThumbnailDirectory().$partition.$thumbFile;
-
-        return $result;
+        return $this->getThumbnailDirectory().$partition.$thumbFile;
     }
 
     protected function getThumbnailImageUrl($imagePath)
diff --git a/modules/cms/classes/Theme.php b/modules/cms/classes/Theme.php
index 1eb6cc5be..3cb5cfefc 100644
--- a/modules/cms/classes/Theme.php
+++ b/modules/cms/classes/Theme.php
@@ -448,8 +448,7 @@ class Theme
     public function __get($name)
     {
         if ($this->hasCustomData()) {
-            $theme = $this->getCustomData();
-            return $theme->{$name};
+            return $this->getCustomData()->{$name};
         }
 
         return null;
diff --git a/modules/cms/controllers/Index.php b/modules/cms/controllers/Index.php
index 57dc574f2..37534d196 100644
--- a/modules/cms/controllers/Index.php
+++ b/modules/cms/controllers/Index.php
@@ -427,9 +427,7 @@ class Index extends Controller
         $widgetConfig->model = $template;
         $widgetConfig->alias = $alias ?: 'form'.studly_case($type).md5($template->getFileName()).uniqid();
 
-        $widget = $this->makeWidget('Backend\Widgets\Form', $widgetConfig);
-
-        return $widget;
+        return $this->makeWidget('Backend\Widgets\Form', $widgetConfig);
     }
 
     protected function upgradeSettings($settings)
diff --git a/modules/cms/controllers/ThemeOptions.php b/modules/cms/controllers/ThemeOptions.php
index 02fe3d30b..9333e1c06 100644
--- a/modules/cms/controllers/ThemeOptions.php
+++ b/modules/cms/controllers/ThemeOptions.php
@@ -131,8 +131,7 @@ class ThemeOptions extends Controller
     protected function getThemeData($dirName)
     {
         $theme = $this->findThemeObject($dirName);
-        $model = ThemeData::forTheme($theme);
-        return $model;
+        return ThemeData::forTheme($theme);
     }
 
     protected function findThemeObject($name = null)
diff --git a/modules/cms/controllers/Themes.php b/modules/cms/controllers/Themes.php
index 836fbbeb3..d80015d61 100644
--- a/modules/cms/controllers/Themes.php
+++ b/modules/cms/controllers/Themes.php
@@ -115,8 +115,7 @@ class Themes extends Controller
         $widgetConfig->arrayName = 'Theme';
         $widgetConfig->context = 'update';
 
-        $widget = $this->makeWidget(Form::class, $widgetConfig);
-        return $widget;
+        return $this->makeWidget(Form::class, $widgetConfig);
     }
 
     //
@@ -173,8 +172,7 @@ class Themes extends Controller
         $widgetConfig->arrayName = 'Theme';
         $widgetConfig->context = 'create';
 
-        $widget = $this->makeWidget('Backend\Widgets\Form', $widgetConfig);
-        return $widget;
+        return $this->makeWidget('Backend\Widgets\Form', $widgetConfig);
     }
 
     //
@@ -256,8 +254,7 @@ class Themes extends Controller
         $widgetConfig->model->theme = $theme;
         $widgetConfig->arrayName = 'ThemeExport';
 
-        $widget = $this->makeWidget('Backend\Widgets\Form', $widgetConfig);
-        return $widget;
+        return $this->makeWidget('Backend\Widgets\Form', $widgetConfig);
     }
 
     //
@@ -293,8 +290,7 @@ class Themes extends Controller
         $widgetConfig->model->theme = $theme;
         $widgetConfig->arrayName = 'ThemeImport';
 
-        $widget = $this->makeWidget('Backend\Widgets\Form', $widgetConfig);
-        return $widget;
+        return $this->makeWidget('Backend\Widgets\Form', $widgetConfig);
     }
 
     //
diff --git a/modules/system/classes/VersionManager.php b/modules/system/classes/VersionManager.php
index 4b1666a48..8236e44d9 100644
--- a/modules/system/classes/VersionManager.php
+++ b/modules/system/classes/VersionManager.php
@@ -246,8 +246,7 @@ class VersionManager
             return self::NO_VERSION_VALUE;
         }
 
-        $latest = trim(key(array_slice($versionInfo, -1, 1)));
-        return $latest;
+        return trim(key(array_slice($versionInfo, -1, 1)));
     }
 
     /**
diff --git a/modules/system/controllers/Settings.php b/modules/system/controllers/Settings.php
index 0197cd379..522ff0f38 100644
--- a/modules/system/controllers/Settings.php
+++ b/modules/system/controllers/Settings.php
@@ -165,8 +165,7 @@ class Settings extends Controller
         }
 
         $class = $item->class;
-        $model = $class::instance();
-        return $model;
+        return $class::instance();
     }
 
     /**
diff --git a/modules/system/helpers/DateTime.php b/modules/system/helpers/DateTime.php
index 45522071a..e8a68ebaa 100644
--- a/modules/system/helpers/DateTime.php
+++ b/modules/system/helpers/DateTime.php
@@ -130,8 +130,7 @@ class DateTime
             $replacements['\\'.$from] = '['.$from.']';
         }
 
-        $momentFormat = strtr($format, $replacements);
-        return $momentFormat;
+        return strtr($format, $replacements);
     }
 
 }
diff --git a/modules/system/models/MailBrandSetting.php b/modules/system/models/MailBrandSetting.php
index 9e32fe989..95d467d04 100644
--- a/modules/system/models/MailBrandSetting.php
+++ b/modules/system/models/MailBrandSetting.php
@@ -154,8 +154,6 @@ class MailBrandSetting extends Model
 
         $parser->parse(FileHelper::get($basePath . '/custom.less'));
 
-        $css = $parser->getCss();
-
-        return $css;
+        return $parser->getCss();
     }
 }
diff --git a/modules/system/traits/ConfigMaker.php b/modules/system/traits/ConfigMaker.php
index 5e4f95198..0b068227f 100644
--- a/modules/system/traits/ConfigMaker.php
+++ b/modules/system/traits/ConfigMaker.php
@@ -182,8 +182,7 @@ trait ConfigMaker
     {
         $classFolder = strtolower(class_basename($class));
         $classFile = realpath(dirname(File::fromClass($class)));
-        $guessedPath = $classFile ? $classFile . '/' . $classFolder . $suffix : null;
-        return $guessedPath;
+        return $classFile ? $classFile . '/' . $classFolder . $suffix : null;
     }
 
     /**