diff --git a/block_list_override.install b/block_list_override.install
index c62e779..4d20df1 100644
--- a/block_list_override.install
+++ b/block_list_override.install
@@ -34,7 +34,7 @@ function block_list_override_install() {
     }
   }
   if ($found) {
-		  $message = t('Block Blacklist configuration was discovered and is being used to create configuration for Block List Override. You can now uninstall the Block Blacklist module. Please check your settings and confirm they are correct.');
-		  return $message;
-		}
+    $message = t('Block Blacklist configuration was discovered and is being used to create configuration for Block List Override. You can now uninstall the Block Blacklist module. Please check your settings and confirm they are correct.');
+    return $message;
+  }
 }
diff --git a/block_list_override.links.menu.yml b/block_list_override.links.menu.yml
index 27ff513..da077eb 100644
--- a/block_list_override.links.menu.yml
+++ b/block_list_override.links.menu.yml
@@ -4,4 +4,3 @@ block_list_override.settings:
   description: 'Remove blocks from the system.'
   parent: system.admin_config_system
   weight: 99
-
diff --git a/config/install/block_list_override.settings.yml b/config/install/block_list_override.settings.yml
index a6005af..492550a 100644
--- a/config/install/block_list_override.settings.yml
+++ b/config/install/block_list_override.settings.yml
@@ -6,4 +6,3 @@ layout_match: ''
 layout_prefix: ''
 layout_regex: ''
 layout_negate: false
-
diff --git a/src/BlockListOverride.php b/src/BlockListOverride.php
index 7af851a..c69520d 100644
--- a/src/BlockListOverride.php
+++ b/src/BlockListOverride.php
@@ -145,7 +145,7 @@ class BlockListOverride extends ServiceProviderBase {
     }
 
     // (Dis)allow the block if it is not in the list, or if it's already in use.
-    if($this->isNegated){
+    if ($this->isNegated) {
       return in_array($plugin_id, $blocks_in_use)
         || $block_is_listed($plugin_id);
     }
diff --git a/src/Controller/DefaultController.php b/src/Controller/DefaultController.php
index 486408f..601ef36 100644
--- a/src/Controller/DefaultController.php
+++ b/src/Controller/DefaultController.php
@@ -46,9 +46,9 @@ class DefaultController extends ControllerBase {
    * Constructs a new DefaultController object.
    *
    * @param Drupal\Core\Block\BlockManagerInterface $block_manager
-   *  The Block Manager service.
+   *   The Block Manager service.
    * @param Drupal\Core\Plugin\Context\LazyContextRepository $context_repository
-   *  The Context Repository service.
+   *   The Context Repository service.
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   Configuration factory.
    * @param \Drupal\block_list_override\BlockListOverride $list_service
@@ -127,4 +127,5 @@ class DefaultController extends ControllerBase {
     $contexts = $this->contextRepository->getAvailableContexts();
     return $this->blockManager->getDefinitionsForContexts($contexts);
   }
+
 }
diff --git a/src/Controller/LayoutController.php b/src/Controller/LayoutController.php
index 68028f9..ce63f8a 100644
--- a/src/Controller/LayoutController.php
+++ b/src/Controller/LayoutController.php
@@ -2,8 +2,6 @@
 
 namespace Drupal\block_list_override\Controller;
 
-use Drupal\block_list_override\LayoutPluginAlter;
-
 /**
  * Class DefaultController.
  */
diff --git a/src/Form/SettingsForm.php b/src/Form/SettingsForm.php
index c17fd52..948b91e 100644
--- a/src/Form/SettingsForm.php
+++ b/src/Form/SettingsForm.php
@@ -28,6 +28,9 @@ class SettingsForm extends ConfigFormBase {
     $this->entityTypeManager = $entity_type_manager;
   }
 
+  /**
+   * Function to create.
+   */
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
diff --git a/src/LayoutPluginAlter.php b/src/LayoutPluginAlter.php
index df1263e..9e82bb8 100644
--- a/src/LayoutPluginAlter.php
+++ b/src/LayoutPluginAlter.php
@@ -5,7 +5,7 @@ namespace Drupal\block_list_override;
 /**
  * Implementation callbacks for layout builder plugin alter hooks.
  */
-class LayoutPluginAlter extends PluginAlter{
+class LayoutPluginAlter extends PluginAlter {
 
   /**
    * {@inheritdoc}
@@ -22,4 +22,3 @@ class LayoutPluginAlter extends PluginAlter{
   }
 
 }
-
diff --git a/src/PluginAlter.php b/src/PluginAlter.php
index 911623c..51c9e0c 100644
--- a/src/PluginAlter.php
+++ b/src/PluginAlter.php
@@ -6,7 +6,6 @@ use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\block_list_override\BlockListOverride;
 
 /**
  * Implementation callbacks for plugin alter hooks.
@@ -37,7 +36,7 @@ class PluginAlter implements ContainerInjectionInterface {
   /**
    * PluginAlter constructor.
    *
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $configFactory
+   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   Configuration factory.
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
    *   The Entity Type Manager service.
@@ -45,9 +44,9 @@ class PluginAlter implements ContainerInjectionInterface {
    *   The Block List Override service.
    */
   protected function __construct(
-    ConfigFactoryInterface $config_factory,
-    EntityTypeManagerInterface $entity_type_manager,
-    BlockListOverride $list_service) {
+  ConfigFactoryInterface $config_factory,
+  EntityTypeManagerInterface $entity_type_manager,
+  BlockListOverride $list_service) {
     $this->configFactory = $config_factory;
     $this->entityTypeManager = $entity_type_manager;
     $this->listService = $list_service;
@@ -98,4 +97,3 @@ class PluginAlter implements ContainerInjectionInterface {
   }
 
 }
-
diff --git a/tests/src/Functional/BlockListOverrideTest.php b/tests/src/Functional/BlockListOverrideTest.php
index ae7a44f..a180d02 100644
--- a/tests/src/Functional/BlockListOverrideTest.php
+++ b/tests/src/Functional/BlockListOverrideTest.php
@@ -31,7 +31,10 @@ class BlockListOverrideTest extends BrowserTestBase {
    *
    * Array of configuration options with the rule to use and the ID of a block
    * the rule should show/hide.
+   *
+   * @var array
    */
+
   protected static $replace = [
     'system_match' => [
       'label' => 'System List Match',
@@ -67,8 +70,11 @@ class BlockListOverrideTest extends BrowserTestBase {
 
 
   /**
-    * A simple user.
-    */
+   * A simple user.
+   *
+   * @var string
+   */
+
   private $user;
 
   /**
@@ -142,7 +148,7 @@ class BlockListOverrideTest extends BrowserTestBase {
     ];
     foreach ($pages as $type => $page) {
       $this->drupalGet($page);
-      //sleep(30);
+      // sleep(30);.
       $assert->statusCodeEquals(200);
       foreach (self::$replace as $field => $opt) {
         switch ($field) {
@@ -197,7 +203,7 @@ class BlockListOverrideTest extends BrowserTestBase {
     // Test block list results.
     $page = 'admin/config/block_list_override/' . $type . '-list';
     $this->drupalGet($page);
-    //sleep(30);
+    // sleep(30);.
     $assert->statusCodeEquals(200);
     foreach (self::$replace as $field => $opt) {
       switch ($field) {
@@ -251,7 +257,7 @@ class BlockListOverrideTest extends BrowserTestBase {
     // Test block list results.
     $page = 'admin/config/block_list_override/' . $type . '-list';
     $this->drupalGet($page);
-    //sleep(30);
+    // sleep(30);.
     $assert->statusCodeEquals(200);
     foreach (self::$replace as $field => $opt) {
       switch ($field) {