diff --git a/addanother.info b/addanother.info
index c1f5bde..f095f49 100644
--- a/addanother.info
+++ b/addanother.info
@@ -6,4 +6,3 @@ files[] = addanother.module
 files[] = addanother.install
 files[] = addanother.test
 configure = admin/structure/types/addanother
-
diff --git a/addanother.install b/addanother.install
index bfd5243..69303c4 100644
--- a/addanother.install
+++ b/addanother.install
@@ -3,7 +3,6 @@
 /**
  * @file
  * Install, update and uninstall functions for the Add another module.
- *
  */
 
 /**
@@ -19,13 +18,18 @@ function addanother_uninstall() {
     variable_del('addanother_button_' . $typeid);
   }
 
-  variable_del('addanother_default_message'); // can't put the word default at the end of this variable name in the rare case that there is a content type with a machine name of 'default'
+  // Can't put the word default at the end of this variable name in the rare
+  // case that there is a content type with a machine name of 'default'.
+  variable_del('addanother_default_message');
   variable_del('addanother_default_tab');
   variable_del('addanother_default_tab_edit');
   variable_del('addanother_default_button');
 
 }
 
+/**
+ * Update last removed.
+ */
 function addanother_update_last_removed() {
   // All 5.x update functions have been removed.
   return 2;
@@ -64,9 +68,12 @@ function addanother_update_7001() {
 }
 
 /**
- * Clears site-wide menu cache as our callback and access arguments have changed.
+ * Implements hook_update_N().
+ *
+ * Clears site-wide menu cache as our callback
+ * and access arguments have changed.
  */
 function addanother_update_7002() {
   cache_clear_all(NULL, 'cache_menu');
   menu_rebuild();
-}
\ No newline at end of file
+}
diff --git a/addanother.module b/addanother.module
index fb38c38..afee663 100644
--- a/addanother.module
+++ b/addanother.module
@@ -2,12 +2,14 @@
 
 /**
  * @file
+ * The main file for the addanother module.
+ *
  * Presents users with an option to create another node of the same type after a
  * node is added.
  */
 
 /**
- * Implement hook_help().
+ * Implements hook_help().
  */
 function addanother_help($path, $arg) {
   if ($path == "admin/help#addanother") {
@@ -16,7 +18,7 @@ function addanother_help($path, $arg) {
 }
 
 /**
- * Implement hook_permission().
+ * Implements hook_permission().
  */
 function addanother_permission() {
   return array(
@@ -32,7 +34,7 @@ function addanother_permission() {
 }
 
 /**
- * Implement hook_menu().
+ * Implements hook_menu().
  */
 function addanother_menu() {
   $items = array();
@@ -66,7 +68,7 @@ function addanother_goto($node) {
 }
 
 /**
- * Implement hook_admin_paths().
+ * Implements hook_admin_paths().
  */
 function addanother_admin_paths() {
   $paths = array(
@@ -80,7 +82,10 @@ function addanother_admin_paths() {
  * Check if we should display the Add another verbage on a node.
  */
 function addanother_access($node) {
-  if (!node_access('create', $node->type)) return FALSE;
+  if (!node_access('create', $node->type)) {
+    return FALSE;
+  }
+
   if (arg(2) == "edit" &&
       !variable_get('addanother_tab_edit_' . $node->type, FALSE)) {
     return FALSE;
@@ -101,13 +106,14 @@ function addanother_access($node) {
 function addanother_admin() {
   $form['addanother_display'] = array(
     '#type' => 'fieldset',
-    '#title' => t('Default settings for newly created content types'),  
+    '#title' => t('Default settings for newly created content types'),
   );
   $form['addanother_display']['addanother_default_button'] = array(
     '#type' => 'checkbox',
     '#title' => t('Enable <i>Display Add another button on node add form</i> for new content types.'),
-    '#default_value' => variable_get('addanother_default_button', TRUE), // can't put the word default at the end of this variable name 
-                                                                         // in the rare case that there is a content type with a machine name of 'default'
+    '#default_value' => variable_get('addanother_default_button', TRUE),
+    // Can't put the word default at the end of this variable name in the
+    // rare case that there is a content type with a machine name of 'default'.
   );
   $form['addanother_display']['addanother_default_message'] = array(
     '#type' => 'checkbox',
@@ -167,7 +173,7 @@ function addanother_form_node_type_form_alter(&$form, &$form_state) {
 }
 
 /**
- * Implement hook_form_alter().
+ * Implements hook_form_alter().
  */
 function addanother_form_alter(&$form, $form_state, $form_id) {
   if (!empty($form['#node_edit_form']) && empty($form['nid']['#value'])) {
@@ -179,7 +185,7 @@ function addanother_form_alter(&$form, $form_state, $form_id) {
           '#type' => 'submit',
           '#value' => t('Save and add another'),
           '#weight' => -41,
-          '#submit' => array('node_form_submit', 'addanother_node_form_submit')
+          '#submit' => array('node_form_submit', 'addanother_node_form_submit'),
         );
       }
 
@@ -191,6 +197,8 @@ function addanother_form_alter(&$form, $form_state, $form_id) {
 }
 
 /**
+ * Form submit handler for node_form().
+ *
  * Submit handler for the 'Save and add another' button.
  * This allows a redirect to be set if this was the button pressed.
  */
@@ -209,6 +217,8 @@ function addanother_node_form_submit($form, &$form_state) {
 }
 
 /**
+ * Form submit handler for node_form() considering the 'message'.
+ *
  * Submit handler if the normal submit button was pressed, however
  * the node has the 'message' feature enabled.
  */
@@ -221,39 +231,37 @@ function addanother_node_form_message_submit($form, &$form_state) {
 
 
 /**
- * Internal helper function to get the node from a $form_state
+ * Internal helper function to get the node from a $form_state.
  */
 function _addanother_get_node_from_form_state(&$form_state) {
   // Check the node is in the form state - if it isn't, something has gone very
-  // wrong... Best not to continue
+  // wrong... Best not to continue.
   if (!isset($form_state['node'])) {
     return FALSE;
   }
 
-  // Return the node
+  // Return the node.
   return $form_state['node'];
 }
 
 /**
- * Implement hook_theme().
+ * Implements hook_theme().
  *
  * Concept borrowed from 6.x Submit Again.
- *
- * @return array
  */
 function addanother_theme() {
   return array(
     'addanother_message_message' => array(
-      'variables' => array('node' => NULL)
+      'variables' => array('node' => NULL),
     ),
     'addanother_button_message' => array(
-      'variables' => array('nid' => NULL)
+      'variables' => array('nid' => NULL),
     ),
   );
 }
 
 /**
- * Displays a message and link to the added/edited node after submit
+ * Displays a message and link to the added/edited node after submit.
  */
 function theme_addanother_message_message($variables) {
   $node = $variables['node'];
@@ -269,13 +277,13 @@ function theme_addanother_message_message($variables) {
 }
 
 /**
- * Displays a message and link to the added/edited node after submit
+ * Displays a message and link to the added/edited node after submit.
  */
 function theme_addanother_button_message($variables) {
   $node = node_load($variables['nid']);
   $t_args = array(
-      '@type' => node_type_get_name($node),
-      '!title' => l(drupal_placeholder($node->title), 'node/' . $node->nid, array('html' => TRUE)),
+    '@type' => node_type_get_name($node),
+    '!title' => l(drupal_placeholder($node->title), 'node/' . $node->nid, array('html' => TRUE)),
   );
   drupal_set_message(t('@type !title has been created. You may now create another.', $t_args));
   return array();
@@ -285,7 +293,9 @@ function theme_addanother_button_message($variables) {
  * Remove the default Drupal node creation message.
  */
 function _addanother_quelch_message($node) {
-  if (!isset($_SESSION['messages']['status'])) return 0;
+  if (!isset($_SESSION['messages']['status'])) {
+    return 0;
+  }
 
   $t_args = array(
     '@type' => node_type_get_name($node),
@@ -313,7 +323,8 @@ function _addanother_node_type_url($type) {
  */
 function _addanother_node_add_path($node) {
   $path = 'node/add/' . _addanother_node_type_url($node->type);
-  // If we are coming from a node creation path, re-use the path to save additional variables.
+  // If we are coming from a node creation path,re-use the path
+  // to save additional variables.
   if (arg(0) == "node" && arg(1) == "add") {
     $path = $_GET['q'];
   }
diff --git a/addanother.test b/addanother.test
index f1d0fbd..dd59d0c 100644
--- a/addanother.test
+++ b/addanother.test
@@ -5,9 +5,17 @@
  * Unit tests for Add another module.
  */
 
+/**
+ * Class AddanotherTestCase.
+ */
 class AddanotherTestCase extends DrupalWebTestCase {
+  // @codingStandardsIgnoreStart
   protected $privileged_user;
+  // @codingStandardsIgnoreEnd
 
+  /**
+   * Function getInfo.
+   */
   public static function getInfo() {
     return array(
       'name' => 'Add another',
@@ -16,10 +24,16 @@ class AddanotherTestCase extends DrupalWebTestCase {
     );
   }
 
+  /**
+   * Function setUp.
+   */
   public function setUp() {
     parent::setUp('addanother');
   }
 
+  /**
+   * Function testAddanother.
+   */
   public function testAddanother() {
     $nodetype = $this->randomName(8);
     variable_set("addanother_button_$nodetype", TRUE);
@@ -35,7 +49,13 @@ class AddanotherTestCase extends DrupalWebTestCase {
     $type_exists = db_query('SELECT 1 FROM {node_type} WHERE type = :type', array(':type' => $type->type))->fetchField();
     $this->assertTrue($type_exists, 'The new content type has been created in the database.');
 
-    $web_user = $this->drupalCreateUser(array('bypass node access', 'administer content types', 'use add another', 'administer add another'));
+    $web_user = $this->drupalCreateUser(array(
+      'bypass node access',
+      'administer content types',
+      'use add another',
+      'administer add another',
+    ));
+
     $this->drupalLogin($web_user);
 
     // Create a node.
@@ -45,7 +65,7 @@ class AddanotherTestCase extends DrupalWebTestCase {
     $edit["body[$langcode][0][value]"] = $this->randomName(16);
     $this->drupalPost("node/add/$nodetype", $edit, t('Save'));
 
-    // Check that the node has been created
+    // Check that the node has been created.
     $this->assertRaw(t('!post %title has been created.', array('!post' => $nodetype, '%title' => $edit["title"])), t('Node created.'));
     $this->assertText(t('You may add another !type.', array('!type' => $nodetype)), t('Addanother message was presented.'));
     $this->assertLink('Add another');
@@ -70,7 +90,6 @@ class AddanotherTestCase extends DrupalWebTestCase {
     // Check that we ended up back at node add page.
     $this->assertEqual($this->getUrl(), url("node/add/$nodetype", array('query' => array('destination' => 'user'), 'absolute' => TRUE)), 'Destination was retained.');
 
-
     // Create a node with a destination and follow through to destination.
     $edit = array();
     $langcode = LANGUAGE_NONE;