diff --git a/better_search.install b/better_search.install
index cb06f30..023c08a 100644
--- a/better_search.install
+++ b/better_search.install
@@ -1,16 +1,14 @@
 <?php
 
 /**
-* This update sets the new options "Hide the submit button on search pages" and
-* "Enable Better Search on search pages" to true (which is the previous default behavior).
-*/
-
+ * Implements hook_update_N().
+ */
 function better_search_update_8001(&$sandbox) {
-    $config_factory = \Drupal::configFactory();
-    $config = $config_factory->getEditable('better_search.settings');
-    $config->set('searchpage_enable', true);
-    $config->set('searchpage_submit_not_visible', true);
-    $message = "Better Search Blocks enabled on search page and submit button is visually hidden";
-    $config->save(true);
-    return $message;
+  $config_factory = \Drupal::configFactory();
+  $config = $config_factory->getEditable('better_search.settings');
+  $config->set('searchpage_enable', TRUE);
+  $config->set('searchpage_submit_not_visible', TRUE);
+  $message = "Better Search Blocks enabled on search page and submit button is visually hidden";
+  $config->save(TRUE);
+  return $message;
 }
diff --git a/better_search.module b/better_search.module
index a9a5e6d..0d642e9 100644
--- a/better_search.module
+++ b/better_search.module
@@ -14,7 +14,6 @@ use Drupal\Core\Template\Attribute;
  * Implements hook_form_alter().
  */
 function better_search_form_alter(&$form, FormStateInterface $form_state, $form_id) {
-
   if ($form_id == 'search_block_form' || $form_id == 'search_form') {
     $theme = \Drupal::config('better_search.settings')->get('theme');
     switch ($theme) {
@@ -35,11 +34,8 @@ function better_search_form_alter(&$form, FormStateInterface $form_state, $form_
         break;
 
     }
-
     $key = ($form_id == 'search_block_form') ? 'actions' : 'basic';
-
     if ($form_id == 'search_block_form') {
-
       if ($theme == 3) {
         $form['keys']['#suffix'] = '<div class="icon"><i class="better_search"></i></div>';
       }
@@ -51,9 +47,7 @@ function better_search_form_alter(&$form, FormStateInterface $form_state, $form_
       $form['actions']['#attributes']['class'][] = 'visually-hidden';
       $form['keys']['#size'] = \Drupal::config('better_search.settings')->get('size');
     }
-
     $altersearchpage = \Drupal::config('better_search.settings')->get('searchpage_enable');
-
     if ($altersearchpage && $form_id == 'search_form') {
       if ($theme == 3) {
         $form[$key]['keys']['#suffix'] = '<div class="icon"><i class="better_search"></i></div>';
@@ -61,41 +55,30 @@ function better_search_form_alter(&$form, FormStateInterface $form_state, $form_
       else {
         $form[$key]['keys']['#prefix'] = '<div class="icon"><i class="better_search"></i></div>';
       }
-
       $placeholder_text = \Drupal::config('better_search.settings')->get('placeholder_text');
       $form[$key]['keys']['#attributes']['placeholder'] = t('@placeholder', ['@placeholder' => $placeholder_text]);
-
       $submit_not_visible = \Drupal::config('better_search.settings')->get('searchpage_submit_not_visible');
-
       if ($submit_not_visible) {
-
-        /*
-         * Works with Bartik
-         */
-
+        // Works with Bartik.
         /** @var \Drupal\Core\Theme\ActiveTheme $theme */
         $theme = \Drupal::service('theme.manager')->getActiveTheme();
         $main_theme = $theme->getName();
         $base_themes = $theme->getBaseThemeExtensions();
-
-        if ($main_theme == "bootstrap" || array_key_exists('bootstrap', $base_themes)){
+        if ($main_theme == "bootstrap" || array_key_exists('bootstrap', $base_themes)) {
           /* Works with Bootstrap */
-
           $form[$key]['submit']['#attributes'] = [
             'class' => ['visually-hidden'],
           ];
-
-        }else{
+        }
+        else {
           /* Works with other themes */
           if (!isset($form[$key]['submit']['#attributes'])) {
             $form[$key]['submit']['#attributes'] = new Attribute();
           }
           $form[$key]['submit']['#attributes']->addClass('visually-hidden');
         }
-        
       }
       $form[$key]['keys']['#size'] = \Drupal::config('better_search.settings')->get('size');
-
     }
   }
 }
diff --git a/css/background_fade.css b/css/background_fade.css
index bf93d86..e73e98d 100644
--- a/css/background_fade.css
+++ b/css/background_fade.css
@@ -65,7 +65,6 @@ i.better_search {
   -ms-align-items: center;
   -o-align-items: center;
   align-items: center;
-
 }
 
 #search-block-form .icon {