diff --git a/display_cache.admin.inc b/display_cache.admin.inc
index da50216..a454c4a 100644
--- a/display_cache.admin.inc
+++ b/display_cache.admin.inc
@@ -11,7 +11,7 @@
  */
 function display_cache_flush_caches_form($form, $form_state) {
   $form['display_cache_flush_caches'] = array(
-    '#type'  => 'submit',
+    '#type' => 'submit',
     '#value' => t('Flush all display caches'),
   );

@@ -41,10 +41,10 @@ function display_cache_field_ui_form(&$form, &$form_state) {
   // Add additional settings vertical tab.
   if (!isset($form['additional_settings'])) {
     $form['additional_settings'] = array(
-      '#type'           => 'vertical_tabs',
+      '#type' => 'vertical_tabs',
       '#theme_wrappers' => array('vertical_tabs'),
-      '#prefix'         => '<div>',
-      '#suffix'         => '</div>',
+      '#prefix' => '<div>',
+      '#suffix' => '</div>',
     );
     $form['#attached']['js'][] = 'misc/form.js';
     $form['#attached']['js'][] = 'misc/collapse.js';
@@ -52,19 +52,19 @@ function display_cache_field_ui_form(&$form, &$form_state) {

   // Add fieldset.
   $form['display_cache'] = array(
-    '#title'       => t('Display Cache Display Settings'),
-    '#type'        => 'fieldset',
-    '#group'       => 'additional_settings',
+    '#title' => t('Display Cache Display Settings'),
+    '#type' => 'fieldset',
+    '#group' => 'additional_settings',
     '#collapsible' => TRUE,
-    '#collapsed'   => TRUE,
-    '#access'      => user_access('administer display cache'),
+    '#collapsed' => TRUE,
+    '#access' => user_access('administer display cache'),
   );

   // Add radios with caching options for the display.
   $display_cache_options = array(
     DISPLAY_CACHE_DISABLED => t('No caching'),
-    DISPLAY_CACHE_ENABLED  => t('Cache display'),
-    DISPLAY_CACHE_FIELDS   => t('Cache fields only'),
+    DISPLAY_CACHE_ENABLED => t('Cache display'),
+    DISPLAY_CACHE_FIELDS => t('Cache fields only'),
   );

   // Set default value.
@@ -73,15 +73,15 @@ function display_cache_field_ui_form(&$form, &$form_state) {
     $use_default_value = $settings['default']['use'];
   }
   $form['display_cache']['display_cache_use'] = array(
-    '#type'          => 'radios',
-    '#title'         => t('Cache the rendered HTML of this view mode.'),
+    '#type' => 'radios',
+    '#title' => t('Cache the rendered HTML of this view mode.'),
     '#default_value' => $use_default_value,
-    '#options'       => $display_cache_options,
+    '#options' => $display_cache_options,
   );

   // Add radios with granularity options for cache-per-page.
   $page_granularity_options = array(
-    0                     => t('No page granularity'),
+    0 => t('No page granularity'),
     DRUPAL_CACHE_PER_PAGE => t('Cache per URL'),
   );

@@ -92,11 +92,11 @@ function display_cache_field_ui_form(&$form, &$form_state) {
   }

   $form['display_cache']['display_cache_page_granularity'] = array(
-    '#type'          => 'radios',
-    '#title'         => t('Cache per URL'),
+    '#type' => 'radios',
+    '#title' => t('Cache per URL'),
     '#default_value' => $page_default_value,
-    '#options'       => $page_granularity_options,
-    '#states'        => array(
+    '#options' => $page_granularity_options,
+    '#states' => array(
       'invisible' => array(
         'input[name="display_cache_use"]' => array('value' => 0),
       ),
@@ -105,7 +105,7 @@ function display_cache_field_ui_form(&$form, &$form_state) {

   // Add radios with granularity options for users.
   $user_granularity_options = array(
-    0                     => t('No user granularity'),
+    0 => t('No user granularity'),
     DRUPAL_CACHE_PER_ROLE => t('Cache per role'),
     DRUPAL_CACHE_PER_USER => t('Cache per user'),
   );
@@ -117,11 +117,11 @@ function display_cache_field_ui_form(&$form, &$form_state) {
   }

   $form['display_cache']['display_cache_user_granularity'] = array(
-    '#type'          => 'radios',
-    '#title'         => t('User granularity'),
+    '#type' => 'radios',
+    '#title' => t('User granularity'),
     '#default_value' => $user_default_value,
-    '#options'       => $user_granularity_options,
-    '#states'        => array(
+    '#options' => $user_granularity_options,
+    '#states' => array(
       'invisible' => array(
         'input[name="display_cache_use"]' => array('value' => 0),
       ),
@@ -133,16 +133,16 @@ function display_cache_field_ui_form(&$form, &$form_state) {

     $form['display_cache']['clear_on_comment_publication'] = array(
       '#default_value' => $clear_on_comment_publication,
-      '#description'   => t('Should the display cache for this view mode be cleared, if a comment is (un-)published or deleted for this node type.<br />
+      '#description' => t('Should the display cache for this view mode be cleared, if a comment is (un-)published or deleted for this node type.<br />
           This could be useful if you use any information about the comments in a view mode.'),
-      '#states'        => array(
+      '#states' => array(
         'invisible' => array(
           'input[name="display_cache_use"]' => array('value' => 0),
-          $settings['display_cache_use']    => FALSE
+          $settings['display_cache_use'] => FALSE,
         ),
       ),
-      '#title'         => t('Clear display cache on comment (un-)publication/deletion'),
-      '#type'          => 'checkbox',
+      '#title' => t('Clear display cache on comment (un-)publication/deletion'),
+      '#type' => 'checkbox',
     );
   }

@@ -160,12 +160,12 @@ function display_cache_field_ui_form(&$form, &$form_state) {
     ksort($fields);
   }
   $form['display_cache_fields'] = array(
-    '#title'       => t('Display Cache Field Settings'),
-    '#type'        => 'fieldset',
+    '#title' => t('Display Cache Field Settings'),
+    '#type' => 'fieldset',
     '#collapsible' => TRUE,
-    '#collapsed'   => TRUE,
-    '#group'       => 'additional_settings',
-    '#access'      => user_access('administer display cache'),
+    '#collapsed' => TRUE,
+    '#group' => 'additional_settings',
+    '#access' => user_access('administer display cache'),
     '#description' => t('Use this options to cache fields with less granularity.'),
   );

@@ -195,10 +195,10 @@ function _display_cache_field_settings_form(&$form, &$form_state, $settings, $fi
   // Add fieldset for this fields settings.
   $fieldset = 'display_cache_field_' . $field_name;
   $form['display_cache_fields'][$fieldset] = array(
-    '#type'        => 'fieldset',
-    '#title'       => $field_name,
+    '#type' => 'fieldset',
+    '#title' => $field_name,
     '#collapsible' => TRUE,
-    '#collapsed'   => TRUE,
+    '#collapsed' => TRUE,
   );

   // Disable field settings if display cache is disabled.
@@ -215,7 +215,7 @@ function _display_cache_field_settings_form(&$form, &$form_state, $settings, $fi

   // Add radios with caching options for this field.
   $display_cache_options = array(
-    DISPLAY_CACHE_FIELDS  => t('Use default'),
+    DISPLAY_CACHE_FIELDS => t('Use default'),
     DISPLAY_CACHE_ENABLED => t('Override display cache defaults'),
   );

@@ -235,10 +235,10 @@ function _display_cache_field_settings_form(&$form, &$form_state, $settings, $fi
   }

   $form['display_cache_fields'][$fieldset][$fieldset . '_override'] = array(
-    '#type'          => 'radios',
-    '#title'         => t('Override display cache defaults'),
+    '#type' => 'radios',
+    '#title' => t('Override display cache defaults'),
     '#default_value' => $override_default_value,
-    '#options'       => $display_cache_options,
+    '#options' => $display_cache_options,
   );

   // Add radios with page granularity options.
@@ -254,11 +254,11 @@ function _display_cache_field_settings_form(&$form, &$form_state, $settings, $fi
   }

   $form['display_cache_fields'][$fieldset][$fieldset . '_page_granularity'] = array(
-    '#type'          => 'radios',
-    '#title'         => t('Cache per URL'),
+    '#type' => 'radios',
+    '#title' => t('Cache per URL'),
     '#default_value' => $page_default_value,
-    '#options'       => $page_granularity_options,
-    '#states'        => array(
+    '#options' => $page_granularity_options,
+    '#states' => array(
       'visible' => array(
         'input[name="' . $fieldset . '_override"]' => array('value' => 1),
       ),
@@ -289,11 +289,11 @@ function _display_cache_field_settings_form(&$form, &$form_state, $settings, $fi
   }

   $form['display_cache_fields'][$fieldset][$fieldset . '_user_granularity'] = array(
-    '#type'          => 'radios',
-    '#title'         => t('User granularity'),
+    '#type' => 'radios',
+    '#title' => t('User granularity'),
     '#default_value' => $user_default_value,
-    '#options'       => $user_granularity_options,
-    '#states'        => array(
+    '#options' => $user_granularity_options,
+    '#states' => array(
       'visible' => array(
         'input[name="' . $fieldset . '_override"]' => array('value' => 1),
       ),
@@ -403,11 +403,11 @@ function display_cache_view_mode_settings_form_submit($form, $form_state) {
 function display_cache_node_type_form(&$form, &$form_state) {
   if (isset($form['comment'])) {
     $form['comment']['display_cache_comment_publication_clears_host_entity_cache'] = array(
-      '#description'   => t('Should the display cache for this node type be cleared, if a comment is (un-)published or deleted for this node type.<br />
+      '#description' => t('Should the display cache for this node type be cleared, if a comment is (un-)published or deleted for this node type.<br />
         This could be useful if you use any information about the comments in a view mode.<br />
         <b>Please be aware that on a site with a lot of view modes for this node type and an active community this can have a big perfomance impact.</b>'),
-      '#title'         => t('Clear host entity display cache on comment (un-)publication/deletion'),
-      '#type'          => 'checkbox',
+      '#title' => t('Clear host entity display cache on comment (un-)publication/deletion'),
+      '#type' => 'checkbox',
       '#default_value' => variable_get('display_cache_comment_publication_clears_host_entity_cache_' . $form['#node_type']->type, FALSE),
     );
   }
diff --git a/display_cache.info b/display_cache.info
index 969ecae..a0b1eac 100644
--- a/display_cache.info
+++ b/display_cache.info
@@ -11,4 +11,3 @@ version = "7.x-1.3"
 core = "7.x"
 project = "display_cache"
 datestamp = "1435913350"
-
diff --git a/display_cache.module b/display_cache.module
index ccf75e0..dc7965f 100644
--- a/display_cache.module
+++ b/display_cache.module
@@ -49,13 +49,13 @@ function display_cache_menu() {

   // Menu item for configurations.
   $menu_items['admin/config/development/display-cache'] = array(
-    'title'            => 'Display Cache',
-    'description'      => 'Form to submit cache flush for display cache.',
-    'page callback'    => 'drupal_get_form',
-    'page arguments'   => array('display_cache_flush_caches_form'),
+    'title' => 'Display Cache',
+    'description' => 'Form to submit cache flush for display cache.',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('display_cache_flush_caches_form'),
     'access arguments' => array('administer display cache'),
-    'file'             => 'display_cache.admin.inc',
-    'type'             => MENU_NORMAL_ITEM,
+    'file' => 'display_cache.admin.inc',
+    'type' => MENU_NORMAL_ITEM,
   );

   return $menu_items;
@@ -66,7 +66,7 @@ function display_cache_menu() {
  */
 function display_cache_admin_menu_cache_info() {
   $links['display_cache'] = array(
-    'title'    => 'Display Caches',
+    'title' => 'Display Caches',
     'callback' => '_display_cache_clear_cache',
   );

@@ -79,7 +79,7 @@ function display_cache_admin_menu_cache_info() {
 function display_cache_permission() {
   return array(
     'administer display cache' => array(
-      'title'       => t('Administer Display Cache'),
+      'title' => t('Administer Display Cache'),
       'description' => t('Permission to administer display cache settings and clear display cache caches from the ui.'),
     ),
   );
@@ -234,10 +234,10 @@ function display_cache_get_settings($entity_type, $bundle, $view_mode) {
     if (!$settings) {
       return array(
         'default' => array(
-          'use'              => DISPLAY_CACHE_DISABLED,
+          'use' => DISPLAY_CACHE_DISABLED,
           'page_granularity' => DISPLAY_CACHE_DISABLED,
           'user_granularity' => DISPLAY_CACHE_DISABLED,
-          'granularity'      => DISPLAY_CACHE_DISABLED,
+          'granularity' => DISPLAY_CACHE_DISABLED,
         ),
       );
     }
@@ -311,8 +311,8 @@ function display_cache_entity_view_alter(&$build, $entity_type) {
     $keys = display_cache_get_cache_keys($entity_type, $entity_id, $view_mode, 'entity');

     $build['#cache'] = array(
-      'keys'        => $keys,
-      'bin'         => DISPLAY_CACHE_CACHE_BIN,
+      'keys' => $keys,
+      'bin' => DISPLAY_CACHE_CACHE_BIN,
       'granularity' => $display_settings['granularity'],
     );
   }
@@ -351,8 +351,8 @@ function display_cache_field_attach_view_alter(&$output, $context) {
         $keys = display_cache_get_cache_keys($entity_type, $entity_id, $view_mode, $field_name);

         $element['#cache'] = array(
-          'keys'        => $keys,
-          'bin'         => DISPLAY_CACHE_CACHE_BIN,
+          'keys' => $keys,
+          'bin' => DISPLAY_CACHE_CACHE_BIN,
           'granularity' => $settings[$field_name]['granularity'],
         );
       }
@@ -463,7 +463,7 @@ function display_cache_get_cached_display($entity_type, $bundle = NULL, $entity_
     $keys = display_cache_get_cache_keys($entity_type, $entity_id, $view_mode, $element);
     $cid_parts = array(
       '#cache' => array(
-        'keys'        => $keys,
+        'keys' => $keys,
         'granularity' => $settings['default']['granularity'],
       ),
     );
@@ -546,7 +546,7 @@ function display_cache_get_comment_publication_clears_host_entity_cache_setting_
   $variable_name_parts = array(
     'display_cache_comment_publication_clears_host_entity_cache',
     $entity_type,
-    $bundle
+    $bundle,
   );

   return implode('_', $variable_name_parts);
diff --git a/tests/display_cache.test b/tests/display_cache.test
index 7330b86..74dc217 100644
--- a/tests/display_cache.test
+++ b/tests/display_cache.test
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @file
+ * The test file for the Display Cache module.
+ */

 /**
  * DisplayCacheTestCase.
@@ -6,14 +10,14 @@
 class DisplayCacheTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name'        => 'Display Cache Test Case',
+      'name' => 'Display Cache Test Case',
       'description' => 'Tests if the cache is operating',
-      'group'       => 'Entity cache',
+      'group' => 'Entity cache',
     );
   }

-  function setUp() {
+  public function setUp() {
     parent::setup();
     module_enable(array('display_cache'));
   }
-}
\ No newline at end of file
+}