diff --git a/coffee.api.php b/coffee.api.php
index 21cb1e4..482cc27 100644
--- a/coffee.api.php
+++ b/coffee.api.php
@@ -42,7 +42,7 @@ function hook_coffee_commands() {
         'label' => 'Pub: ' . $entity->label(),
         // You can also specify commands that if the user enters, this command
         // should show.
-        'command' => ':x' . ' ' . $entity->label(),
+        'command' => ':x ' . $entity->label(),
       );
     }
   }
diff --git a/coffee.coffee.inc b/coffee.coffee.inc
index 388dd8a..f0a8c75 100644
--- a/coffee.coffee.inc
+++ b/coffee.coffee.inc
@@ -2,8 +2,7 @@
 
 /**
  * @file
- * The hooks that are used by Coffee
- * includes an example of hook_coffee_commands().
+ * The hooks that are used by Coffee includes an example of hook_coffee_commands().
  */
 
 use Drupal\Core\Url;
diff --git a/coffee.module b/coffee.module
index 1d08f3b..8564d40 100644
--- a/coffee.module
+++ b/coffee.module
@@ -80,7 +80,7 @@ function coffee_toolbar() {
         '#title' => t('Go to'),
         '#url' => Url::fromRoute('<none>'),
         '#attributes' => [
-          'title' => t('Use alt+d to start Coffee and search for a page to go to '),
+          'title' => t('Use alt+d to start Coffee and search for a page to go to.'),
           'class' => ['toolbar-icon', 'toolbar-icon-coffee'],
         ],
       ],
diff --git a/css/coffee.css b/css/coffee.css
index 314f9f3..08e6fe1 100644
--- a/css/coffee.css
+++ b/css/coffee.css
@@ -17,7 +17,7 @@
   z-index: 999;
 }
 
-.coffee-form-wrapper{
+.coffee-form-wrapper {
   pointer-events: none;
   left: 0;
   width: 100%;
@@ -26,7 +26,7 @@
   z-index: 9999;
 }
 #coffee-form {
-  pointer-events: auto;
+  pointer-events : auto;
   position:relative;
   margin: 0 auto;
   max-width: 500px;
@@ -50,7 +50,7 @@
 
 #coffee-form,
 #coffee-form input,
-#coffee-form a{
+#coffee-form a {
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
   box-sizing: border-box;
@@ -166,12 +166,12 @@
 
 .toolbar .toolbar-bar .toolbar-icon-coffee:before,
 .toolbar .toolbar-bar .toolbar-icon-coffee.active:before {
-    background-image: url("../images/icons/bebebe/coffee.svg");
+  background-image: url("../images/icons/bebebe/coffee.svg");
 }
 
-#coffee-q{
-    background-image: url("../images/icons/bebebe/coffee.svg");
-    background-position: right 10px center;
-    background-repeat: no-repeat;
-    background-size: 40px 40px;
+#coffee-q {
+  background-image: url("../images/icons/bebebe/coffee.svg");
+  background-position: right 10px center;
+  background-repeat: no-repeat;
+  background-size: 40px 40px;
 }
diff --git a/js/coffee.js b/js/coffee.js
index 14297c3..6d68a4f 100644
--- a/js/coffee.js
+++ b/js/coffee.js
@@ -32,13 +32,8 @@
     }
   });
 
-  /**
-   * Coffee module namespace
-   *
-   * @namespace
-   *
-   * @todo put this in Drupal.coffee to expose it.
-   */
+
+  // Coffee module namespace. @namespace @todo put this in Drupal.coffee to expose it.
   DrupalCoffee = DrupalCoffee || {};
 
   /**
@@ -51,7 +46,7 @@
    * @prop {Drupal~behaviorAttach} attach
    *   Attach coffee functionality to the page.
    *
-   *   @todo get most of it out of the behavior in dedicated functions.
+   * @todo get most of it out of the behavior in dedicated functions.
    */
   Drupal.behaviors.coffee = {
     attach: function () {
@@ -79,11 +74,11 @@
           success: function (data) {
             DrupalCoffee.dataset = data;
 
-            // Apply autocomplete plugin on show
+            // Apply autocomplete plugin on show.
             var $autocomplete = $(DrupalCoffee.field).autocomplete({
               source: DrupalCoffee.dataset,
               focus: function (event, ui) {
-                // Prevents replacing the value of the input field
+                // Prevents replacing the value of the input field.
                 DrupalCoffee.isItemSelected = true;
                 event.preventDefault();
               },
@@ -100,7 +95,7 @@
             });
 
             $autocomplete.data(autocomplete_data_element)._renderItem = function (ul, item) {
-              // strip the basePath when displaying the link description
+              // Strip the basePath when displaying the link description.
               var description = item.value;
               if (item.value.indexOf(drupalSettings.path.basePath) === 0) {
                 description = item.value.substring(drupalSettings.path.basePath.length);
@@ -147,7 +142,7 @@
           event.preventDefault();
           DrupalCoffee.coffee_show();
         });
-        // Key events
+        // Key events.
         $(document).keydown(function (event) {
 
           // Show the form with alt + D. Use 2 keycodes as 'D' can be uppercase or lowercase.
@@ -172,7 +167,6 @@
 
   // Prefix the open and close functions to avoid
   // conflicts with autocomplete plugin.
-
   /**
    * Open the form and focus on the search field.
    */
@@ -212,11 +206,7 @@
     }
   };
 
-  /**
-   * The HTML elements.
-   *
-   * @todo use Drupal.theme.
-   */
+  // The HTML elements. @todo use Drupal.theme.
   DrupalCoffee.label = $('<label for="coffee-q" class="hidden" />').text(Drupal.t('Query', '', ''));
   DrupalCoffee.results = $('<div id="coffee-results" />');
   DrupalCoffee.wrapper = $('<div class="coffee-form-wrapper" />');
diff --git a/src/Controller/CoffeeController.php b/src/Controller/CoffeeController.php
index fd83507..3a00a4b 100644
--- a/src/Controller/CoffeeController.php
+++ b/src/Controller/CoffeeController.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\coffee\Controller\CoffeeController.
- */
-
 namespace Drupal\coffee\Controller;
 
 use Drupal\Core\Access\AccessManagerInterface;
@@ -188,9 +183,9 @@ class CoffeeController extends ControllerBase {
     $tree = $this->localTaskManager->getLocalTasksForRoute($route_name);
     $route_match = \Drupal::routeMatch();
 
-    foreach ($tree as $level => $instances) {
-      /** @var $instances \Drupal\Core\Menu\LocalTaskInterface[] */
-      foreach ($instances as $plugin_id => $child) {
+    foreach ($tree as $instances) {
+      // @var $instances \Drupal\Core\Menu\LocalTaskInterface[].
+      foreach ($instances as $child) {
         $child_route_name = $child->getRouteName();
         // Merges the parent's route parameter with the child ones since you
         // calculate the local tasks outside of parent route context.
diff --git a/src/Form/CoffeeConfigurationForm.php b/src/Form/CoffeeConfigurationForm.php
index 0950783..85d5cb4 100644
--- a/src/Form/CoffeeConfigurationForm.php
+++ b/src/Form/CoffeeConfigurationForm.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\coffee\Form\CoffeeConfigurationForm.
- */
-
 namespace Drupal\coffee\Form;
 
 use Drupal\Core\Form\ConfigFormBase;
diff --git a/src/Tests/CoffeeHookCoffeeCommandsTest.php b/src/Tests/CoffeeHookCoffeeCommandsTest.php
index 1d36d5d..ddaba55 100644
--- a/src/Tests/CoffeeHookCoffeeCommandsTest.php
+++ b/src/Tests/CoffeeHookCoffeeCommandsTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\coffee\Tests\CoffeeHookCoffeeCommandsTest.
- */
-
 namespace Drupal\coffee\Tests;
 
 use Drupal\Core\Url;
diff --git a/src/Tests/CoffeeTest.php b/src/Tests/CoffeeTest.php
index c0b3d06..460d00e 100644
--- a/src/Tests/CoffeeTest.php
+++ b/src/Tests/CoffeeTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\coffee\Tests\CoffeeTest.
- */
-
 namespace Drupal\coffee\Tests;
 
 use Drupal\simpletest\WebTestBase;
@@ -47,7 +42,7 @@ class CoffeeTest extends WebTestBase {
   /**
    * {@inheritdoc}
    */
-  public function setUp(){
+  public function setUp() {
     parent::setUp();
 
     $this->webUser = $this->drupalCreateUser();