diff --git a/modules/backend/behaviors/ReorderController.php b/modules/backend/behaviors/ReorderController.php
index e0c7c9981..28a602394 100644
--- a/modules/backend/behaviors/ReorderController.php
+++ b/modules/backend/behaviors/ReorderController.php
@@ -55,7 +55,7 @@ class ReorderController extends ControllerBehavior
      * - simple: October\Rain\Database\Traits\Sortable
      * - nested: October\Rain\Database\Traits\NestedTree
      */
-    protected $sortMode = null;
+    protected $sortMode;
 
     /**
      * @var Backend\Classes\WidgetBase Reference to the widget used for the toolbar.
diff --git a/modules/backend/classes/FilterScope.php b/modules/backend/classes/FilterScope.php
index 683b6915d..d82cb1f81 100644
--- a/modules/backend/classes/FilterScope.php
+++ b/modules/backend/classes/FilterScope.php
@@ -54,7 +54,7 @@ class FilterScope
     /**
      * @var string Specifies contextual visibility of this form scope.
      */
-    public $context = null;
+    public $context;
 
     /**
      * @var bool Specify if the scope is disabled or not.
diff --git a/modules/backend/classes/FormField.php b/modules/backend/classes/FormField.php
index a8980ae6e..05a3f5a01 100644
--- a/modules/backend/classes/FormField.php
+++ b/modules/backend/classes/FormField.php
@@ -94,12 +94,12 @@ class FormField
     /**
      * @var string Specifies contextual visibility of this form field.
      */
-    public $context = null;
+    public $context;
 
     /**
      * @var bool Specifies if this field is mandatory.
      */
-    public $required = null;
+    public $required;
 
     /**
      * @var bool Specify if the field is read-only or not.
diff --git a/modules/backend/classes/FormTabs.php b/modules/backend/classes/FormTabs.php
index 253c8e358..f40e3be1d 100644
--- a/modules/backend/classes/FormTabs.php
+++ b/modules/backend/classes/FormTabs.php
@@ -35,7 +35,7 @@ class FormTabs implements IteratorAggregate, ArrayAccess
     /**
      * @var bool Should these tabs stretch to the bottom of the page layout.
      */
-    public $stretch = null;
+    public $stretch;
 
     /**
      * @var boolean If set to TRUE, fields will not be displayed in tabs.
diff --git a/modules/backend/formwidgets/DatePicker.php b/modules/backend/formwidgets/DatePicker.php
index 2259174a6..da774b90b 100644
--- a/modules/backend/formwidgets/DatePicker.php
+++ b/modules/backend/formwidgets/DatePicker.php
@@ -26,25 +26,25 @@ class DatePicker extends FormWidgetBase
     /**
      * @var string Provide an explicit date display format.
      */
-    public $format = null;
+    public $format;
 
     /**
      * @var string the minimum/earliest date that can be selected.
      * eg: 2000-01-01
      */
-    public $minDate = null;
+    public $minDate;
 
     /**
      * @var string the maximum/latest date that can be selected.
      * eg: 2020-12-31
      */
-    public $maxDate = null;
+    public $maxDate;
 
     /**
      * @var string number of years either side or array of upper/lower range
      * eg: 10 or [1900,1999]
      */
-    public $yearRange = null;
+    public $yearRange;
 
     /**
      * @var int first day of the week
diff --git a/modules/backend/formwidgets/FileUpload.php b/modules/backend/formwidgets/FileUpload.php
index 006ba8cfd..3d36cb2ae 100644
--- a/modules/backend/formwidgets/FileUpload.php
+++ b/modules/backend/formwidgets/FileUpload.php
@@ -36,17 +36,17 @@ class FileUpload extends FormWidgetBase
     /**
      * @var string Prompt text to display for the upload button.
      */
-    public $prompt = null;
+    public $prompt;
 
     /**
      * @var int Preview image width
      */
-    public $imageWidth = null;
+    public $imageWidth;
 
     /**
      * @var int Preview image height
      */
-    public $imageHeight = null;
+    public $imageHeight;
 
     /**
      * @var mixed Collection of acceptable file types.
diff --git a/modules/backend/formwidgets/MediaFinder.php b/modules/backend/formwidgets/MediaFinder.php
index 817d0af78..70c077b8c 100644
--- a/modules/backend/formwidgets/MediaFinder.php
+++ b/modules/backend/formwidgets/MediaFinder.php
@@ -37,12 +37,12 @@ class MediaFinder extends FormWidgetBase
     /**
      * @var int Preview image width
      */
-    public $imageWidth = null;
+    public $imageWidth;
 
     /**
      * @var int Preview image height
      */
-    public $imageHeight = null;
+    public $imageHeight;
 
     //
     // Object properties
diff --git a/modules/backend/formwidgets/Repeater.php b/modules/backend/formwidgets/Repeater.php
index e56da85aa..6c0cdf269 100644
--- a/modules/backend/formwidgets/Repeater.php
+++ b/modules/backend/formwidgets/Repeater.php
@@ -39,12 +39,12 @@ class Repeater extends FormWidgetBase
     /**
      * @var int Minimum items required. Pre-displays those items when not using groups
      */
-    public $minItems = null;
+    public $minItems;
 
     /**
      * @var int Maximum items permitted
      */
-    public $maxItems = null;
+    public $maxItems;
 
     //
     // Object properties
diff --git a/modules/backend/formwidgets/RichEditor.php b/modules/backend/formwidgets/RichEditor.php
index 48f548156..b9532d54c 100644
--- a/modules/backend/formwidgets/RichEditor.php
+++ b/modules/backend/formwidgets/RichEditor.php
@@ -29,7 +29,7 @@ class RichEditor extends FormWidgetBase
     /**
      * @var boolean Determines whether content has HEAD and HTML tags.
      */
-    public $toolbarButtons = null;
+    public $toolbarButtons;
 
     /**
      * @var boolean If true, the editor is set to read-only mode
diff --git a/modules/backend/formwidgets/TagList.php b/modules/backend/formwidgets/TagList.php
index 0ec1d4102..88e62d645 100644
--- a/modules/backend/formwidgets/TagList.php
+++ b/modules/backend/formwidgets/TagList.php
@@ -30,7 +30,7 @@ class TagList extends FormWidgetBase
     /**
      * @var mixed Predefined options settings. Set to true to get from model.
      */
-    public $options = null;
+    public $options;
 
     /**
      * @var string Mode for the return value. Values: string, array, relation.
diff --git a/modules/backend/widgets/Filter.php b/modules/backend/widgets/Filter.php
index 9af3a8c57..a1e155ec7 100644
--- a/modules/backend/widgets/Filter.php
+++ b/modules/backend/widgets/Filter.php
@@ -32,7 +32,7 @@ class Filter extends WidgetBase
      * @var string The context of this filter, scopes that do not belong
      * to this context will not be shown.
      */
-    public $context = null;
+    public $context;
 
     //
     // Object properties
diff --git a/modules/backend/widgets/Form.php b/modules/backend/widgets/Form.php
index ae88098a7..901e34292 100644
--- a/modules/backend/widgets/Form.php
+++ b/modules/backend/widgets/Form.php
@@ -56,7 +56,7 @@ class Form extends WidgetBase
      * @var string The context of this form, fields that do not belong
      * to this context will not be shown.
      */
-    public $context = null;
+    public $context;
 
     /**
      * @var string If the field element names should be contained in an array.
diff --git a/modules/backend/widgets/MediaManager.php b/modules/backend/widgets/MediaManager.php
index b9de13fbf..d6d8d8884 100644
--- a/modules/backend/widgets/MediaManager.php
+++ b/modules/backend/widgets/MediaManager.php
@@ -38,7 +38,7 @@ class MediaManager extends WidgetBase
 
     const FILTER_EVERYTHING = 'everything';
 
-    protected $brokenImageHash = null;
+    protected $brokenImageHash;
 
     /**
      * @var boolean Determines whether the widget is in readonly mode or not
diff --git a/modules/backend/widgets/Table.php b/modules/backend/widgets/Table.php
index 9de40a3c6..990a99a59 100644
--- a/modules/backend/widgets/Table.php
+++ b/modules/backend/widgets/Table.php
@@ -34,12 +34,12 @@ class Table extends WidgetBase
     /**
      * @var Backend\Widgets\Table\DatasourceBase
      */
-    protected $dataSource = null;
+    protected $dataSource;
 
     /**
      * @var string Field name used for request data.
      */
-    protected $fieldName = null;
+    protected $fieldName;
 
     /**
      * @var string
diff --git a/modules/cms/classes/Asset.php b/modules/cms/classes/Asset.php
index 6247fcb00..d64ed9956 100644
--- a/modules/cms/classes/Asset.php
+++ b/modules/cms/classes/Asset.php
@@ -34,7 +34,7 @@ class Asset extends Extendable
     /**
      * @var string Specifies the file name, the CMS object was loaded from.
      */
-    protected $originalFileName = null;
+    protected $originalFileName;
 
     /**
      * @var string Last modified time.
diff --git a/modules/cms/classes/CmsCompoundObject.php b/modules/cms/classes/CmsCompoundObject.php
index 8eea1b5d0..3318e1c7e 100644
--- a/modules/cms/classes/CmsCompoundObject.php
+++ b/modules/cms/classes/CmsCompoundObject.php
@@ -73,7 +73,7 @@ class CmsCompoundObject extends CmsObject
     /**
      * @var array|null Cache for component properties.
      */
-    protected static $objectComponentPropertyMap = null;
+    protected static $objectComponentPropertyMap;
 
     /**
      * @var mixed Cache store for the getViewBag method.
diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php
index 43f80329c..4bea8bc1e 100644
--- a/modules/cms/classes/Controller.php
+++ b/modules/cms/classes/Controller.php
@@ -99,12 +99,12 @@ class Controller
     /**
      * @var self Cache of self
      */
-    protected static $instance = null;
+    protected static $instance;
 
     /**
      * @var \Cms\Classes\ComponentBase Object of the active component, used internally.
      */
-    protected $componentContext = null;
+    protected $componentContext;
 
     /**
      * @var array Component partial stack, used internally.
diff --git a/modules/cms/classes/PartialStack.php b/modules/cms/classes/PartialStack.php
index d49db3465..98136e8ae 100644
--- a/modules/cms/classes/PartialStack.php
+++ b/modules/cms/classes/PartialStack.php
@@ -13,7 +13,7 @@ class PartialStack
     /**
      * @var array The current partial "object" being rendered.
      */
-    public $activePartial = null;
+    public $activePartial;
 
     /**
      * @var array Collection of previously rendered partial "objects".
diff --git a/modules/cms/classes/Theme.php b/modules/cms/classes/Theme.php
index e6ae6c64f..1eb6cc5be 100644
--- a/modules/cms/classes/Theme.php
+++ b/modules/cms/classes/Theme.php
@@ -34,7 +34,7 @@ class Theme
     /**
      * @var mixed Keeps the cached configuration file values.
      */
-    protected $configCache = null;
+    protected $configCache;
 
     /**
      * @var mixed Active theme cache in memory
diff --git a/modules/cms/helpers/Cms.php b/modules/cms/helpers/Cms.php
index d94ac1bdf..e8195d2a5 100644
--- a/modules/cms/helpers/Cms.php
+++ b/modules/cms/helpers/Cms.php
@@ -12,7 +12,7 @@ use Route;
  */
 class Cms
 {
-    protected static $actionExists = null;
+    protected static $actionExists;
 
     /**
      * Returns a URL in context of the Frontend
diff --git a/modules/cms/traits/UrlMaker.php b/modules/cms/traits/UrlMaker.php
index 50fc3a26b..210922cfa 100644
--- a/modules/cms/traits/UrlMaker.php
+++ b/modules/cms/traits/UrlMaker.php
@@ -72,12 +72,12 @@ trait UrlMaker
     /**
      * @var string URL cache
      */
-    protected $url = null;
+    protected $url;
 
     /**
      * @var string Page where detected component is found.
      */
-    protected static $urlPageName = null;
+    protected static $urlPageName;
 
     /**
      * Changes the component used for generating the URLs dynamically.
diff --git a/modules/cms/widgets/TemplateList.php b/modules/cms/widgets/TemplateList.php
index a18df610e..46b540550 100644
--- a/modules/cms/widgets/TemplateList.php
+++ b/modules/cms/widgets/TemplateList.php
@@ -63,7 +63,7 @@ class TemplateList extends WidgetBase
     /**
      * @var string Extra CSS class name to apply to the control.
      */
-    public $controlClass = null;
+    public $controlClass;
 
     /**
      * @var string A list of file name patterns to suppress / hide.
diff --git a/modules/system/models/PluginVersion.php b/modules/system/models/PluginVersion.php
index 6fbd26398..321cb60df 100644
--- a/modules/system/models/PluginVersion.php
+++ b/modules/system/models/PluginVersion.php
@@ -28,7 +28,7 @@ class PluginVersion extends Model
     /**
      * @var array Cache store for version information
      */
-    protected static $versionCache = null;
+    protected static $versionCache;
 
     /**
      * @var bool Plugin has been disabled by a missing dependency.