diff --git a/src/Controller/SystemStatusController.php b/src/Controller/SystemStatusController.php
index 41bc1c0..21e50c6 100644
--- a/src/Controller/SystemStatusController.php
+++ b/src/Controller/SystemStatusController.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\pants\Controller\SystemStatusController.
- */
-
 namespace Drupal\system_status\Controller;
 
 use Drupal\Component\Serialization\Yaml;
@@ -16,7 +11,6 @@ use Drupal\system_status\Services\SystemStatusEncryption;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
 
-
 /**
  * Returns responses for Sensei's Pants routes.
  */
@@ -27,22 +21,25 @@ class SystemStatusController extends ControllerBase {
    *
    * @var \Drupal\Core\Extension\ModuleHandlerInterface
    */
-  protected $module_handler;
+  protected $moduleHandler;
 
   /**
    * The theme handler.
    *
    * @var \Drupal\Core\Extension\ThemeHandlerInterface
    */
-  protected $theme_handler;
+  protected $themeHandler;
 
   /**
-   * The system status encrypt service
+   * The system status encrypt service.
    *
    * @var \Drupal\system_status\Services\SystemStatusEncryption
    */
   protected $encrypt;
 
+  /**
+   * {@inheritdoc}
+   */
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('module_handler'),
@@ -53,20 +50,24 @@ class SystemStatusController extends ControllerBase {
 
   /**
    * SystemStatusController constructor.
+   *
    * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
+   *   The module handler to invoke the alter hook with.
    * @param \Drupal\Core\Extension\ThemeHandlerInterface $theme_handler
+   *   The theme handler.
    * @param \Drupal\system_status\Services\SystemStatusEncryption $encrypt
+   *   The System Status encrypt.
    */
   public function __construct(ModuleHandlerInterface $module_handler, ThemeHandlerInterface $theme_handler, SystemStatusEncryption $encrypt) {
-    $this->module_handler = $module_handler;
-    $this->theme_handler = $theme_handler;
+    $this->moduleHandler = $module_handler;
+    $this->themeHandler = $theme_handler;
     $this->encrypt = $encrypt;
   }
 
   /**
    * Changes Sensei's pants and returns the display of the new status.
    */
-  function load($system_status_token) {
+  public function load($system_status_token) {
 
     // Needless initialisation, but hey.
     $res = [
@@ -75,44 +76,47 @@ class SystemStatusController extends ControllerBase {
       "theme" => [],
     ];
 
-    $drupal_modules = $this->module_handler->getModuleList();
-    $drupal_themes = $this->theme_handler->listInfo();
+    $drupal_modules = $this->moduleHandler->getModuleList();
+    $drupal_themes = $this->themeHandler->listInfo();
 
-    foreach($drupal_modules as $name => $module) {
+    foreach ($drupal_modules as $name => $module) {
 
       $filename = $module->getPath() . '/' . $module->getFilename();
       $module_info = Yaml::decode(file_get_contents($filename));
 
-      // this can happen when you install using composer
-      if(isset($module_info['version']) && $module_info['version'] == "VERSION") {
-          $module_info['version'] = \Drupal::VERSION;
+      // This can happen when you install using composer.
+      if (isset($module_info['version']) && $module_info['version'] == "VERSION") {
+        $module_info['version'] = \Drupal::VERSION;
       }
 
-      if(!isset($module_info['version']))
-	$module_info['version'] = null;
+      if (!isset($module_info['version'])) {
+        $module_info['version'] = NULL;
+      }
 
-      // do our best to guess the correct drupal version
-      if($name == "system" && $module_info['package'] == "Core")
+      // Do our best to guess the correct drupal version.
+      if ($name == "system" && $module_info['package'] == "Core") {
         $res['core']['drupal'] = ["version" => $module_info['version']];
+      }
 
-      // Skip Core and Field types
-      if((isset($module_info['package']) && $module_info['package'] == "Core") || (isset($module_info['package']) && $module_info['package'] == "Field types") || (isset($module_info['project']) && $module_info['project'] == 'drupal'))
-         continue;
+      // Skip Core and Field types.
+      if ((isset($module_info['package']) && $module_info['package'] == "Core") || (isset($module_info['package']) && $module_info['package'] == "Field types") || (isset($module_info['project']) && $module_info['project'] == 'drupal')) {
+        continue;
+      }
 
       // TODO:
       // if(!isset($module['version']))
       // we can be 90% sure it's not contrib, so we can put it in custom
       // hard to test as system_status is not released yet so no version
-      // let's put all the rest in 'contrib' for now
-
-      if(isset($module_info['project'])) {
-          $res['contrib'][$module_info['project']] = ["version" => $module_info['version']];
-      } else {
-          $res['contrib'][$name] = ["version" => $module_info['version']];
+      // let's put all the rest in 'contrib' for now.
+      if (isset($module_info['project'])) {
+        $res['contrib'][$module_info['project']] = ["version" => $module_info['version']];
+      }
+      else {
+        $res['contrib'][$name] = ["version" => $module_info['version']];
       }
     }
 
-    foreach($drupal_themes as $name => $theme) {
+    foreach ($drupal_themes as $name => $theme) {
       $filename = $theme->getPath() . '/' . $theme->getFilename();
       $theme_info = Yaml::decode(file_get_contents($filename));
 
@@ -120,38 +124,60 @@ class SystemStatusController extends ControllerBase {
         $theme_info['version'] = NULL;
       }
 
-      // this can happen when you install using composer
-      if($theme_info['version'] == "VERSION") {
-          $theme_info['version'] = \Drupal::VERSION;
+      // This can happen when you install using composer.
+      if ($theme_info['version'] == "VERSION") {
+        $theme_info['version'] = \Drupal::VERSION;
       }
 
-      if(isset($theme_info['project']) && $theme_info['project'] == 'drupal')
+      if (isset($theme_info['project']) && $theme_info['project'] == 'drupal') {
         continue;
+      }
 
-      if(isset($theme_info['project'])) {
+      if (isset($theme_info['project'])) {
         $res['theme'][$theme_info['project']] = ["version" => $theme_info['version']];
-      } else {
+      }
+      else {
         $res['theme'][$name] = ["version" => $theme_info['version']];
       }
     }
 
     $config = $this->config('system_status.settings');
-    if(function_exists('openssl_random_pseudo_bytes')) {
-      $res = SystemStatusEncryption::encrypt_openssl(json_encode(["system_status" => $res]));
-      return new JsonResponse(["system_status" => "encrypted_openssl", "data" => $res, "drupal_version" => "8", "engine_version" => "DRUPAL8", "php_version" => phpversion()]);
+    if (function_exists('openssl_random_pseudo_bytes')) {
+      $res = SystemStatusEncryption::encryptOpenssl(json_encode(["system_status" => $res]));
+      return new JsonResponse([
+        "system_status" => "encrypted_openssl",
+        "data" => $res,
+        "drupal_version" => "8",
+        "engine_version" => "DRUPAL8",
+        "php_version" => phpversion(),
+      ]);
     }
-    else if (extension_loaded('mcrypt')) {
-      $res = SystemStatusEncryption::encrypt_mcrypt(json_encode(["system_status" => $res]));
-      return new JsonResponse(["system_status" => "encrypted", "data" => $res, "drupal_version" => "8", "engine_version" => "DRUPAL8", "php_version" => phpversion()]);
+    elseif (extension_loaded('mcrypt')) {
+      $res = SystemStatusEncryption::encryptMcrypt(json_encode(["system_status" => $res]));
+      return new JsonResponse([
+        "system_status" => "encrypted",
+        "data" => $res,
+        "drupal_version" => "8",
+        "engine_version" => "DRUPAL8",
+        "php_version" => phpversion(),
+      ]);
     }
     else {
-      return new JsonResponse(["system_status" => $res, "drupal_version" => "8", "engine_version" => "DRUPAL8", "php_version" => phpversion()]);
+      return new JsonResponse([
+        "system_status" => $res,
+        "drupal_version" => "8",
+        "engine_version" => "DRUPAL8",
+        "php_version" => phpversion(),
+      ]);
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function access($system_status_token) {
     $token = $this->config('system_status.settings')->get('system_status_token');
-    if($token == $system_status_token) {
+    if ($token == $system_status_token) {
       return AccessResult::allowed();
     }
     else {
diff --git a/src/Form/SystemStatusSettingsForm.php b/src/Form/SystemStatusSettingsForm.php
index 5721a85..f4e98d1 100644
--- a/src/Form/SystemStatusSettingsForm.php
+++ b/src/Form/SystemStatusSettingsForm.php
@@ -1,15 +1,9 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\pants\Form\PantsSettingsForm.
- */
-
 namespace Drupal\system_status\Form;
 
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\TrustedRedirectResponse;
 
 /**
  * Configure pants settings for this site.
@@ -19,7 +13,7 @@ class SystemStatusSettingsForm extends ConfigFormBase {
   /**
    * {@inheritdoc}
    */
-  public function getFormID() {
+  public function getFormId() {
     return 'system_status_settings';
   }
 
@@ -29,16 +23,16 @@ class SystemStatusSettingsForm extends ConfigFormBase {
   public function buildForm(array $form, FormStateInterface $form_state) {
     $config = $this->config('system_status.settings');
 
-    $form['system_status_service'] = array(
+    $form['system_status_service'] = [
       '#type' => 'textfield',
       '#title' => t('Your siteUUID'),
       '#description' => $config->get('system_status_token') . "-" . $config->get('system_status_encrypt_token'),
       '#default_value' => $config->get('system_status_token') . "-" . $config->get('system_status_encrypt_token'),
-      '#attributes' => array('style' => array('display:none;')),
+      '#attributes' => ['style' => ['display:none;']],
       '#size' => 60,
       '#maxlength' => 60,
       '#disabled' => TRUE,
-    );
+    ];
 
     $form['system_status_service_allow_external'] = [
       '#type' => 'checkbox',
@@ -69,4 +63,5 @@ class SystemStatusSettingsForm extends ConfigFormBase {
 
     parent::submitForm($form, $form_state);
   }
+
 }
diff --git a/src/Services/SystemStatusEncryption.php b/src/Services/SystemStatusEncryption.php
index 69118d3..0a27ab2 100644
--- a/src/Services/SystemStatusEncryption.php
+++ b/src/Services/SystemStatusEncryption.php
@@ -1,10 +1,10 @@
 <?php
-/**
- * @file
- * Encryption logic for system_status
- */
+
 namespace Drupal\system_status\Services;
 
+/**
+ * Encryption logic for system_status.
+ */
 class SystemStatusEncryption {
 
   /**
@@ -29,7 +29,7 @@ class SystemStatusEncryption {
   /**
    * System Status: encrypt a plaintext message using mcrypt.
    */
-  public static function encrypt_mcrypt($plaintext) {
+  public static function encryptMcrypt($plaintext) {
     $encrypt_token = \Drupal::config('system_status.settings')->get('system_status_encrypt_token');
     $key = hash("SHA256", $encrypt_token, TRUE);
 
@@ -48,7 +48,7 @@ class SystemStatusEncryption {
   /**
    * System Status: encrypt a plaintext message using openssl.
    */
-  public static function encrypt_openssl($plaintext) {
+  public static function encryptOpenssl($plaintext) {
     $encrypt_token = \Drupal::config('system_status.settings')->get('system_status_encrypt_token');
     $key = hash("SHA256", $encrypt_token, TRUE);
     $plaintext_utf8 = utf8_encode($plaintext);
@@ -56,6 +56,7 @@ class SystemStatusEncryption {
     $iv = openssl_random_pseudo_bytes(16);
     $cyphertext = openssl_encrypt($plaintext_utf8, 'AES-128-CBC', $key, OPENSSL_RAW_DATA, $iv);
 
-    return base64_encode($iv.$cyphertext);
+    return base64_encode($iv . $cyphertext);
   }
+
 }
diff --git a/system_status.install b/system_status.install
index ad70112..466172f 100644
--- a/system_status.install
+++ b/system_status.install
@@ -1,7 +1,5 @@
 <?php
 
-use Drupal\system_status\Services\SystemStatusEncryption;
-
 /**
  * @file
  * Installation file for system_status.
diff --git a/system_status.module b/system_status.module
index 7973498..667f0de 100644
--- a/system_status.module
+++ b/system_status.module
@@ -1,7 +1,8 @@
 <?php
+
 /**
  * @file
- * Drupal system status
+ * Drupal system status.
  */
 
 /**
@@ -12,7 +13,7 @@
 function system_status_help($path, $arg) {
   switch ($path) {
     case 'admin/help#system_status':
-      $output = '<h2>' . t('System Status module information') .'</h2>';
+      $output = '<h2>' . t('System Status module information') . '</h2>';
       $output .= '<p>' . t('System Status provides an easy way to get an overview of all the available updates for your Drupal websites.') . '<br/>';
       $output .= t('Enable the System Status module on all your Drupal websites and allow reporting to DrupalStatus.org for a centralized overview and email summaries of available updates and installed versions.') . '</p>';
       $output .= '<p>' . t('The accompanying service offered by DrupalStatus.org is free but if you do not want to use this service this lightweight module allows you to built your own overviews and dashboard.') . '</p>';
@@ -23,6 +24,7 @@ function system_status_help($path, $arg) {
       $output .= '</ul>';
 
       return $output;
+
     break;
   }
 }
@@ -31,14 +33,14 @@ function system_status_help($path, $arg) {
  * Implements hook_menu().
  */
 function system_status_menu() {
-  $items = array();
-  
-  $items['admin/config/system/system_status'] = array(
+  $items = [];
+
+  $items['admin/config/system/system_status'] = [
     'title' => 'System Status',
     'description' => 'Configuration for System status module',
     'route_name' => 'system_status.admin_settings',
     'type' => MENU_LOCAL_TASK | MENU_NORMAL_ITEM,
-  );
+  ];
 
   return $items;
 }
@@ -47,8 +49,9 @@ function system_status_menu() {
  * Access callback: Check authorized IP.
  *
  * @see system_status_menu()
+ *
+ * TODO $request->attributes->get('_raw_variables')->get('system_status_token')
  */
-// TODOD* $request->attributes->get('_raw_variables')->get('system_status_token')
 function system_status_access_callback($token = FALSE) {
   $config = \Drupal::config('system_status.settings');
   if ($config->get('system_status_service_allow_external') == 0 || $token !== $config->get('system_status_token')) {
@@ -57,4 +60,3 @@ function system_status_access_callback($token = FALSE) {
 
   return TRUE;
 }
-