diff --git a/modules/backend/widgets/form/partials/_field_dropdown.htm b/modules/backend/widgets/form/partials/_field_dropdown.htm
index c51e4eee0..1bfa0711a 100644
--- a/modules/backend/widgets/form/partials/_field_dropdown.htm
+++ b/modules/backend/widgets/form/partials/_field_dropdown.htm
@@ -24,9 +24,8 @@
             <option
                 <?= $value == $field->value ? 'selected="selected"' : '' ?>
                 <?php if (isset($option[1])): ?>data-<?=strpos($option[1],'.')?'image':'icon'?>="<?= $option[1] ?>"<?php endif ?>
-                value="<?= $value ?>">
-                    <?= e(trans($option[0])) ?>
-            </option>
+                value="<?= $value ?>"
+            ><?= e(trans($option[0])) ?></option>
         <?php endforeach ?>
     </select>
 <?php endif?>
diff --git a/modules/system/ServiceProvider.php b/modules/system/ServiceProvider.php
index b0aa83c2f..229b3a0ad 100644
--- a/modules/system/ServiceProvider.php
+++ b/modules/system/ServiceProvider.php
@@ -84,7 +84,7 @@ class ServiceProvider extends ModuleServiceProvider
         /*
          * Boot plugins
          */
-        $pluginManager = PluginManager::instance()->bootAll();
+        PluginManager::instance()->bootAll();
 
         parent::boot('system');
     }
diff --git a/modules/system/classes/ErrorHandler.php b/modules/system/classes/ErrorHandler.php
index c8e7e907b..6a919b96f 100644
--- a/modules/system/classes/ErrorHandler.php
+++ b/modules/system/classes/ErrorHandler.php
@@ -6,11 +6,8 @@ use Config;
 use Cms\Classes\Theme;
 use Cms\Classes\Router;
 use Cms\Classes\Controller;
-use Cms\Classes\CmsException;
 use October\Rain\Exception\ErrorHandler as ErrorHandlerBase;
 use October\Rain\Exception\ApplicationException;
-use Twig_Error_Runtime;
-use Exception;
 
 /**
  * System Error Handler, this class handles application exception events.
diff --git a/modules/system/classes/MarkupManager.php b/modules/system/classes/MarkupManager.php
index 4457c0389..9dd263c2f 100644
--- a/modules/system/classes/MarkupManager.php
+++ b/modules/system/classes/MarkupManager.php
@@ -294,7 +294,7 @@ class MarkupManager
      * Tests if a callable type contains a wildcard, also acts as a 
      * utility to replace the wildcard with a string.
      * @param  callable  $callable
-     * @param  string $replaceWith
+     * @param  string|bool $replaceWith
      * @return mixed
      */
     protected function isWildCallable($callable, $replaceWith = false)
diff --git a/modules/system/classes/PluginBase.php b/modules/system/classes/PluginBase.php
index 279033d41..48ade4de7 100644
--- a/modules/system/classes/PluginBase.php
+++ b/modules/system/classes/PluginBase.php
@@ -49,7 +49,9 @@ class PluginBase extends ServiceProviderBase
             'method in the plugin class.', $thisClass));
 
         if (!array_key_exists('plugin', $configuration)) {
-            throw new SystemException(sprintf('The plugin configuration file plugin.yaml should contain the "plugin" section: %s.', $thisClass));
+            throw new SystemException(sprintf(
+                'The plugin configuration file plugin.yaml should contain the "plugin" section: %s.', $thisClass)
+            );
         }
 
         return $configuration['plugin'];
@@ -247,7 +249,7 @@ class PluginBase extends ServiceProviderBase
         else {
             $this->loadedYamlConfiguration = Yaml::parse(file_get_contents($yamlFilePath));
             if (!is_array($this->loadedYamlConfiguration)) {
-                throw new SystemException('Invalid format of the plugin configuration file: %s. The file should define an array.', $yamlFilePath);
+                throw new SystemException(sprintf('Invalid format of the plugin configuration file: %s. The file should define an array.', $yamlFilePath));
             }
         }