diff --git a/config/schema/email_registration.schema.yml b/config/schema/email_registration.schema.yml
index 6f390cd..a13fdd7 100644
--- a/config/schema/email_registration.schema.yml
+++ b/config/schema/email_registration.schema.yml
@@ -4,4 +4,4 @@ email_registration.settings:
   mapping:
     login_with_username:
       type: boolean
-      label: 'Allow users login with e-mail or username.'
+      label: 'Allow users to log in with e-mail or username.'
diff --git a/email_registration.install b/email_registration.install
index a3b48c1..3d41199 100644
--- a/email_registration.install
+++ b/email_registration.install
@@ -1,10 +1,8 @@
 <?php
 
-use Symfony\Component\Yaml\Yaml;
-
 /**
  * @file
- * Checks requirements for the email_registration.module.
+ * Update and installation requirement hooks for the Email Registration module.
  */
 
 /**
@@ -26,6 +24,9 @@ function email_registration_requirements() {
   return $requirements;
 }
 
+/**
+ * Add an option to log in with the username as well as the e-mail address.
+ */
 function email_registration_update_8100() {
   $config_factory = \Drupal::configFactory();
   $email_registration = $config_factory->getEditable('email_registration.settings');
diff --git a/email_registration.module b/email_registration.module
index 2ef41b4..a54a888 100644
--- a/email_registration.module
+++ b/email_registration.module
@@ -136,8 +136,8 @@ function email_registration_form_user_pass_alter(&$form, FormStateInterface $for
 function email_registration_form_user_login_form_alter(&$form, FormStateInterface $form_state) {
   $config = \Drupal::config('email_registration.settings');
   $login_with_username = $config->get('login_with_username');
-  $form['name']['#title']  = isset($login_with_username) ? t('E-mail or username') : t('E-mail');
-  $form['name']['#description']  = isset($login_with_username) ? t('Enter your e-mail address or username.') : t('Enter your e-mail address.');;
+  $form['name']['#title'] = isset($login_with_username) ? t('E-mail or username') : t('E-mail');
+  $form['name']['#description'] = isset($login_with_username) ? t('Enter your e-mail address or username.') : t('Enter your e-mail address.');
   $form['name']['#element_validate'][] = 'email_registration_user_login_validate';
   $form['pass']['#description'] = t('Enter the password that accompanies your e-mail.');
   // Allow client side validation of input format.
@@ -159,8 +159,8 @@ function email_registration_user_login_validate($form, FormStateInterface $form_
     }
     elseif (!$config->get('login_with_username')) {
       $user_input = $form_state->getUserInput();
-      $query = isset($user_input['name']) ? array('name' => $user_input['name']) : array();
-      $form_state->setErrorByName('name', t('Unrecognized e-mail address or password. <a href=":password">Forgot your password?</a>', array(':password' => Url::fromRoute('user.pass', [], array('query' => $query))->toString())));
+      $query = isset($user_input['name']) ? ['name' => $user_input['name']] : [];
+      $form_state->setErrorByName('name', t('Unrecognized e-mail address or password. <a href=":password">Forgot your password?</a>', [':password' => Url::fromRoute('user.pass', [], ['query' => $query])->toString()]));
     }
   }
 }
@@ -175,16 +175,16 @@ function email_registration_form_user_form_alter(&$form, FormStateInterface $for
 /**
  * Implements hook_form_FORM_ID_alter().
  */
-function email_registration_form_user_admin_settings_alter(&$form, &$form_state) {
-    $config = \Drupal::config('email_registration.settings');
-    $form['registration_cancellation']['login_with_username'] = array(
-        '#type' => 'checkbox',
-        '#title' => t('Allow users login with e-mail or username.'),
-        '#description' => t('Allow users to login with their username in addition to their e-mail.'),
-        '#default_value' => $config->get('login_with_username'),
-      );
-    $form['#submit'][] = 'email_registration_form_user_admin_settings_submit';
-  }
+function email_registration_form_user_admin_settings_alter(&$form, FormStateInterface $form_state) {
+  $config = \Drupal::config('email_registration.settings');
+  $form['registration_cancellation']['login_with_username'] = [
+    '#type' => 'checkbox',
+    '#title' => t('Allow to log in with e-mail or username.'),
+    '#description' => t('Allow users to log in with either their username or their e-mail address.'),
+    '#default_value' => $config->get('login_with_username'),
+  ];
+  $form['#submit'][] = 'email_registration_form_user_admin_settings_submit';
+}
 
 /**
  * Submit function for user_admin_settings to save our variable.
@@ -192,6 +192,6 @@ function email_registration_form_user_admin_settings_alter(&$form, &$form_state)
  * @see email_registration_form_user_admin_settings_alter().
  */
 function email_registration_form_user_admin_settings_submit(array &$form, FormStateInterface $form_state) {
-    $config = \Drupal::configFactory()->getEditable('email_registration.settings');
-    $config->set('login_with_username', $form_state->getValue('login_with_username'))->save();
+  $config = \Drupal::configFactory()->getEditable('email_registration.settings');
+  $config->set('login_with_username', $form_state->getValue('login_with_username'))->save();
 }