diff --git a/src/Plugin/Block/DisclosureMenuBlock.php b/src/Plugin/Block/DisclosureMenuBlock.php
index b3dbcfa..cd363fa 100644
--- a/src/Plugin/Block/DisclosureMenuBlock.php
+++ b/src/Plugin/Block/DisclosureMenuBlock.php
@@ -91,8 +91,8 @@ class DisclosureMenuBlock extends SystemMenuBlock {
       '#type' => 'details',
       '#states' => [
         'invisible' => [
-          ':input[name="settings[depth]"]' => ['value' => '1']
-        ]
+          ':input[name="settings[depth]"]' => ['value' => '1'],
+        ],
       ],
       '#process' => [[get_class(), 'processMenuLevelParents']],
     ];
@@ -160,11 +160,11 @@ class DisclosureMenuBlock extends SystemMenuBlock {
         '#default_value' => $this->configuration['disclosure_button_label'],
         '#states' => [
           'required' => [
-            ':input[name="settings[depth]"]' => ['!value' => 1],
+            [':input[name="settings[depth]"]' => ['!value' => 1]],
             'and',
-            $submenu_disclosure_levels => ['!value' => 0],
+            [$submenu_disclosure_levels => ['!value' => 0]],
             'and',
-            $disclosure_button_include_label => ['value' => 1]
+            [$disclosure_button_include_label => ['value' => 1]],
           ],
         ],
       ],
@@ -174,9 +174,9 @@ class DisclosureMenuBlock extends SystemMenuBlock {
       ],
       '#states' => [
         'visible' => [
-          $submenu_disclosure_levels => ['!value' => 0],
+          [$submenu_disclosure_levels => ['!value' => 0]],
           'and',
-          $disclosure_button_include_label => ['value' => 1]
+          [$disclosure_button_include_label => ['value' => 1]],
         ],
       ],
     ];
@@ -194,7 +194,7 @@ class DisclosureMenuBlock extends SystemMenuBlock {
         0 => $this->t('No'),
         1 => $this->t('Yes'),
       ],
-      '#default_value' => $this->configuration['menu_disclosure']
+      '#default_value' => $this->configuration['menu_disclosure'],
     ];
     $menu_disclosure = ':input[name="settings[menu_disclosure]"]';
 
@@ -208,7 +208,7 @@ class DisclosureMenuBlock extends SystemMenuBlock {
       '#default_value' => $this->configuration['menu_disclosure_button_include_label'],
       '#states' => [
         'visible' => [
-          $menu_disclosure => ['value' => 1]
+          $menu_disclosure => ['value' => 1],
         ],
       ],
     ];
@@ -225,7 +225,7 @@ class DisclosureMenuBlock extends SystemMenuBlock {
         '#states' => [
           'required' => [
             $menu_disclosure => ['value' => 1],
-            $menu_disclosure_button_include_label  => ['value' => 1]
+            $menu_disclosure_button_include_label  => ['value' => 1],
           ],
         ],
       ],
@@ -235,9 +235,9 @@ class DisclosureMenuBlock extends SystemMenuBlock {
       '#states' => [
         'visible' => [
           $menu_disclosure => ['value' => 1],
-          $menu_disclosure_button_include_label  => ['value' => 1]
+          $menu_disclosure_button_include_label  => ['value' => 1],
         ],
-      ]
+      ],
     ];
 
     $form['disclosure_js'] = [
@@ -303,7 +303,7 @@ class DisclosureMenuBlock extends SystemMenuBlock {
         ),
         'no_change' => $this->t('Do not change the behavior'),
       ],
-      '#states' => $visible_on_all_js_enabled
+      '#states' => $visible_on_all_js_enabled,
     ];
 
     $form['disclosure_js']['hover_show_delay'] = [
@@ -314,7 +314,7 @@ class DisclosureMenuBlock extends SystemMenuBlock {
         'How many milliseconds to wait before displaying the submenu when hovering over the parent menu item'
       ),
       '#default_value' => $this->configuration['hover_show_delay'],
-      '#states' => $visible_on_all_js_enabled
+      '#states' => $visible_on_all_js_enabled,
     ];
 
     $form['disclosure_js']['hover_hide_delay'] = [
@@ -325,7 +325,7 @@ class DisclosureMenuBlock extends SystemMenuBlock {
         'How many milliseconds to wait before hiding the submenu when the pointer is no longer hovering over the parent menu item or the submenu'
       ),
       '#default_value' => $this->configuration['hover_hide_delay'],
-      '#states' => $visible_on_all_js_enabled
+      '#states' => $visible_on_all_js_enabled,
     ];
 
     return $form;
@@ -336,30 +336,30 @@ class DisclosureMenuBlock extends SystemMenuBlock {
    */
   public function blockSubmit($form, FormStateInterface $form_state) {
     parent::blockSubmit($form, $form_state);
-    $this->configuration['submenu_disclosure_levels'] = $form_state->
-      getValue('submenu_disclosure_levels');
-    $this->configuration['disclosure_button_include_chevron'] = $form_state->
-      getValue('disclosure_button_include_chevron');
-    $this->configuration['disclosure_button_include_label'] = $form_state->
-      getValue('disclosure_button_include_label');
-    $this->configuration['disclosure_button_label'] = $form_state->
-      getValue('disclosure_button_label');
-    $this->configuration['menu_disclosure'] = $form_state->
-      getValue('menu_disclosure');
-    $this->configuration['menu_disclosure_button_include_label'] = $form_state->
-      getValue('menu_disclosure_button_include_label');
-    $this->configuration['menu_disclosure_button_label'] = $form_state->
-      getValue('menu_disclosure_button_label');
-    $this->configuration['include_default_js'] = $form_state->
-      getValue('include_default_js');
-    $this->configuration['include_hover_js'] = $form_state->
-      getValue('include_hover_js');
-    $this->configuration['resolve_hover_click'] = $form_state->
-      getValue('resolve_hover_click');
-    $this->configuration['hover_show_delay'] = $form_state->
-      getValue('hover_show_delay');
-    $this->configuration['hover_hide_delay'] = $form_state->
-      getValue('hover_hide_delay');
+    $this->configuration['submenu_disclosure_levels'] = $form_state
+      ->getValue('submenu_disclosure_levels');
+    $this->configuration['disclosure_button_include_chevron'] = $form_state
+      ->getValue('disclosure_button_include_chevron');
+    $this->configuration['disclosure_button_include_label'] = $form_state
+      ->getValue('disclosure_button_include_label');
+    $this->configuration['disclosure_button_label'] = $form_state
+      ->getValue('disclosure_button_label');
+    $this->configuration['menu_disclosure'] = $form_state
+      ->getValue('menu_disclosure');
+    $this->configuration['menu_disclosure_button_include_label'] = $form_state
+      ->getValue('menu_disclosure_button_include_label');
+    $this->configuration['menu_disclosure_button_label'] = $form_state
+      ->getValue('menu_disclosure_button_label');
+    $this->configuration['include_default_js'] = $form_state
+      ->getValue('include_default_js');
+    $this->configuration['include_hover_js'] = $form_state
+      ->getValue('include_hover_js');
+    $this->configuration['resolve_hover_click'] = $form_state
+      ->getValue('resolve_hover_click');
+    $this->configuration['hover_show_delay'] = $form_state
+      ->getValue('hover_show_delay');
+    $this->configuration['hover_hide_delay'] = $form_state
+      ->getValue('hover_hide_delay');
   }
 
   /**