diff --git a/modules/rh_node/rh_node.module b/modules/rh_node/rh_node.module
index 3957d0c..36010f2 100644
--- a/modules/rh_node/rh_node.module
+++ b/modules/rh_node/rh_node.module
@@ -1,6 +1,13 @@
 <?php
 
 /**
+ * @file
+ * Contains rh_node.module.
+ */
+
+use Drupal\Core\Entity\EntityTypeInterface;
+
+/**
  * Implements hook_form_FORM_ID_alter().
  *
  * This will add Rabbit Hole options to the node type form. These settings will
@@ -26,7 +33,10 @@ function rh_node_form_node_form_alter(&$form, $form_state) {
   // rh_node permission.
 }
 
-function rh_node_entity_base_field_info(\Drupal\Core\Entity\EntityTypeInterface $entity_type) {
+/**
+ * Implements hook_entity_base_field_info().
+ */
+function rh_node_entity_base_field_info(EntityTypeInterface $entity_type) {
   if ($entity_type->id() == 'node') {
     return \Drupal::service('rabbit_hole.entity_extender')
       ->getRabbitHoleFields('node');
diff --git a/modules/rh_node/src/Plugin/RabbitHoleEntityPlugin/Node.php b/modules/rh_node/src/Plugin/RabbitHoleEntityPlugin/Node.php
index e65edb8..f20d273 100644
--- a/modules/rh_node/src/Plugin/RabbitHoleEntityPlugin/Node.php
+++ b/modules/rh_node/src/Plugin/RabbitHoleEntityPlugin/Node.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\rh_node\Plugin\RabbitHoleEntityPlugin\Node.
- */
-
 namespace Drupal\rh_node\Plugin\RabbitHoleEntityPlugin;
 
 use Drupal\rabbit_hole\Plugin\RabbitHoleEntityPluginBase;
diff --git a/modules/rh_node/src/Tests/BehaviorSettingsFormAlterationsTest.php b/modules/rh_node/src/Tests/BehaviorSettingsFormAlterationsTest.php
index 42e86e4..eee476c 100644
--- a/modules/rh_node/src/Tests/BehaviorSettingsFormAlterationsTest.php
+++ b/modules/rh_node/src/Tests/BehaviorSettingsFormAlterationsTest.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains \Drupal\rh_node\Tests\RabbitHoleBehaviorSettingsFormAlterationsTest.
- */
 
 namespace Drupal\rh_node\Tests;
 
@@ -44,7 +40,7 @@ class BehaviorSettingsFormAlterationsTest extends WebTestBase {
     // permissions.
     $this->user = $this->drupalCreateUser(array(
       'bypass node access', 'administer content types',
-      'rabbit hole administer node'
+      'rabbit hole administer node',
     ));
 
     $this->behaviorSettingsManager = $this->container
diff --git a/modules/rh_node/src/Tests/InvocationTest.php b/modules/rh_node/src/Tests/InvocationTest.php
index 2b6d271..f5c22a7 100644
--- a/modules/rh_node/src/Tests/InvocationTest.php
+++ b/modules/rh_node/src/Tests/InvocationTest.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains \Drupal\rh_node\Tests\InvocationTest.
- */
 
 namespace Drupal\rh_node\Tests;
 
diff --git a/modules/rh_taxonomy/rh_taxonomy.module b/modules/rh_taxonomy/rh_taxonomy.module
index 3bde911..1b699be 100644
--- a/modules/rh_taxonomy/rh_taxonomy.module
+++ b/modules/rh_taxonomy/rh_taxonomy.module
@@ -1,9 +1,16 @@
 <?php
 
 /**
+ * @file
+ * Contains rh_taxonomy.module.
+ */
+
+use \Drupal\Core\Entity\EntityTypeInterface;
+
+/**
  * Implements hook_entity_base_field_info().
  */
-function rh_taxonomy_entity_base_field_info(\Drupal\Core\Entity\EntityTypeInterface $entity_type) {
+function rh_taxonomy_entity_base_field_info(EntityTypeInterface $entity_type) {
   if ($entity_type->id() == 'taxonomy_term') {
     return \Drupal::service('rabbit_hole.entity_extender')
       ->getRabbitHoleFields('taxonomy_term');
diff --git a/modules/rh_taxonomy/src/Plugin/RabbitHoleEntityPlugin/Taxonomy.php b/modules/rh_taxonomy/src/Plugin/RabbitHoleEntityPlugin/Taxonomy.php
index 7e4550f..412edce 100644
--- a/modules/rh_taxonomy/src/Plugin/RabbitHoleEntityPlugin/Taxonomy.php
+++ b/modules/rh_taxonomy/src/Plugin/RabbitHoleEntityPlugin/Taxonomy.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\rh_taxonomy_term\Plugin\RabbitHoleEntityPlugin\Taxonomy.
- */
-
 namespace Drupal\rh_taxonomy\Plugin\RabbitHoleEntityPlugin;
 
 use Drupal\rabbit_hole\Plugin\RabbitHoleEntityPluginBase;
@@ -28,4 +23,5 @@ class Taxonomy extends RabbitHoleEntityPluginBase {
       array('actions', 'submit', '#submit'),
     );
   }
+
 }
diff --git a/modules/rh_user/rh_user.module b/modules/rh_user/rh_user.module
index dd7a077..5f6c9f9 100644
--- a/modules/rh_user/rh_user.module
+++ b/modules/rh_user/rh_user.module
@@ -1,6 +1,16 @@
 <?php
 
-function rh_user_entity_base_field_info(\Drupal\Core\Entity\EntityTypeInterface $entity_type) {
+/**
+ * @file
+ * Contains rh_user.module.
+ */
+
+use Drupal\Core\Entity\EntityTypeInterface;
+
+/**
+ * Implements hook_entity_base_field_info().
+ */
+function rh_user_entity_base_field_info(EntityTypeInterface $entity_type) {
   if ($entity_type->id() == 'user') {
     return \Drupal::service('rabbit_hole.entity_extender')
       ->getRabbitHoleFields('user');
diff --git a/modules/rh_user/src/Plugin/RabbitHoleEntityPlugin/User.php b/modules/rh_user/src/Plugin/RabbitHoleEntityPlugin/User.php
index 86bbf23..4f96e32 100644
--- a/modules/rh_user/src/Plugin/RabbitHoleEntityPlugin/User.php
+++ b/modules/rh_user/src/Plugin/RabbitHoleEntityPlugin/User.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\rh_user\Plugin\RabbitHoleEntityPlugin\Node.
- */
-
 namespace Drupal\rh_user\Plugin\RabbitHoleEntityPlugin;
 
 use Drupal\rabbit_hole\Plugin\RabbitHoleEntityPluginBase;
diff --git a/rabbit_hole.module b/rabbit_hole.module
index efc9fa3..045d2ef 100644
--- a/rabbit_hole.module
+++ b/rabbit_hole.module
@@ -2,10 +2,11 @@
 
 /**
  * @file
- * Contains rabbit_hole.module..
+ * Contains rabbit_hole.module.
  */
 
 use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Form\FormStateInterface;
 
 /**
  * Implements hook_help().
@@ -33,11 +34,14 @@ function rabbit_hole_theme() {
 }
 
 /**
- * Handle general aspects of rabbit hole form submission
- * @param type $form
- * @param type &$form_state
+ * Handle general aspects of rabbit hole form submission.
+ *
+ * @param array $form
+ *   The form.
+ * @param \Drupal\Core\Form\FormStateInterface $form_state
+ *   The state of the form.
  */
-function _rabbit_hole_general_form_submit($form, $form_state) {
+function _rabbit_hole_general_form_submit($form, FormStateInterface $form_state) {
   \Drupal::service('rabbit_hole.form_mangler')
     ->handleFormSubmit($form, $form_state);
 }
@@ -45,7 +49,7 @@ function _rabbit_hole_general_form_submit($form, $form_state) {
 /**
  * Implements hook_form_alter().
  */
-function rabbit_hole_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
+function rabbit_hole_form_alter(&$form, FormStateInterface $form_state, $form_id) {
   $affected_types = \Drupal::service('plugin.manager.rabbit_hole_entity_plugin')
     ->loadSupportedEntityTypes();
   $affected_bundle_types = \Drupal::service('plugin.manager.rabbit_hole_entity_plugin')
@@ -54,9 +58,6 @@ function rabbit_hole_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $fo
     ->loadSupportedGlobalForms();
   if (method_exists($form_state->getFormObject(), 'getEntity')) {
     $current_type = $form_state->getFormObject()->getEntity()->getEntityTypeId();
-    $real_type = method_exists($form_state->getFormObject()->getEntity(),
-      'getBundleOf') ? $form_state->getFormObject()->getEntity()->getBundleOf()
-       : $current_type;
     $administer_permitted = \Drupal::currentUser()
             ->hasPermission('rabbit hole administer ' . $current_type);
     if (in_array($current_type, $affected_types) && $administer_permitted) {
@@ -68,7 +69,7 @@ function rabbit_hole_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $fo
           array('_rabbit_hole_general_form_submit'))
       );
     }
-    else if (in_array($current_type, $affected_bundle_types)) {
+    elseif (in_array($current_type, $affected_bundle_types)) {
       \Drupal::service('rabbit_hole.form_mangler')->addRabbitHoleOptionsToEntityForm(
         $form, $form_state->getFormObject()->getEntity());
       $form_state->setSubmitHandlers(
@@ -77,7 +78,7 @@ function rabbit_hole_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $fo
       );
     }
   }
-  else if (array_key_exists($form_id, $affected_global_forms)) {
+  elseif (array_key_exists($form_id, $affected_global_forms)) {
     \Drupal::service('rabbit_hole.form_mangler')->addRabbitHoleOptionsToGlobalForm(
        $form, $affected_global_forms[$form_id]
     );
diff --git a/src/Annotation/RabbitHoleBehaviorPlugin.php b/src/Annotation/RabbitHoleBehaviorPlugin.php
index f7fcde8..f5ed5fd 100644
--- a/src/Annotation/RabbitHoleBehaviorPlugin.php
+++ b/src/Annotation/RabbitHoleBehaviorPlugin.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\rabbit_hole\Annotation\RabbitHoleBehaviorPlugin.
- */
-
 namespace Drupal\rabbit_hole\Annotation;
 
 use Drupal\Component\Annotation\Plugin;
diff --git a/src/Annotation/RabbitHoleEntityPlugin.php b/src/Annotation/RabbitHoleEntityPlugin.php
index 7093ec4..7abb04c 100644
--- a/src/Annotation/RabbitHoleEntityPlugin.php
+++ b/src/Annotation/RabbitHoleEntityPlugin.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\rabbit_hole\Annotation\RabbitHoleEntityPlugin.
- */
-
 namespace Drupal\rabbit_hole\Annotation;
 
 use Drupal\Component\Annotation\Plugin;
diff --git a/src/BehaviorInvoker.php b/src/BehaviorInvoker.php
index bac56d2..0b56941 100644
--- a/src/BehaviorInvoker.php
+++ b/src/BehaviorInvoker.php
@@ -1,19 +1,12 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\rabbit_hole\BehaviorInvoker.
- */
-
 namespace Drupal\rabbit_hole;
 
 use Drupal\Core\Entity\ContentEntityBase;
 use Drupal\Core\Session\AccountProxy;
-use Drupal\rabbit_hole\BehaviorSettingsManager;
 use Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPluginManager;
 use Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPluginInterface;
 use Drupal\rabbit_hole\Plugin\RabbitHoleEntityPluginManager;
-use Drupal\rabbit_hole\EntityExtender;
 use Symfony\Component\HttpFoundation\Response;
 
 /**
@@ -50,7 +43,7 @@ class BehaviorInvoker implements BehaviorInvokerInterface {
   protected $rhEntityExtender;
 
   /**
-   * The current user
+   * The current user.
    *
    * @var Drupal\Core\Session\AccountProxy
    */
diff --git a/src/BehaviorInvokerInterface.php b/src/BehaviorInvokerInterface.php
index f899850..d4c09ea 100644
--- a/src/BehaviorInvokerInterface.php
+++ b/src/BehaviorInvokerInterface.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\rabbit_hole\BehaviorInvokerInterface.
- */
-
 namespace Drupal\rabbit_hole;
 
 /**
diff --git a/src/BehaviorSettingsInterface.php b/src/BehaviorSettingsInterface.php
index d2599c4..7360c6a 100644
--- a/src/BehaviorSettingsInterface.php
+++ b/src/BehaviorSettingsInterface.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\rabbit_hole\BehaviorSettingsInterface.
- */
-
 namespace Drupal\rabbit_hole;
 
 use Drupal\Core\Config\Entity\ConfigEntityInterface;
diff --git a/src/BehaviorSettingsManager.php b/src/BehaviorSettingsManager.php
index 9399c3e..3ce5a35 100644
--- a/src/BehaviorSettingsManager.php
+++ b/src/BehaviorSettingsManager.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\rabbit_hole\BehaviorSettingsManager.
- */
-
 namespace Drupal\rabbit_hole;
 
 use Drupal\Core\Config\ConfigFactory;
@@ -85,7 +80,6 @@ class BehaviorSettingsManager implements BehaviorSettingsManagerInterface {
     return !$actual->isNew() ? $actual : NULL;
   }
 
-
   /**
    * Generate a full ID based on entity type label, bundle label and entity id.
    *
diff --git a/src/BehaviorSettingsManagerInterface.php b/src/BehaviorSettingsManagerInterface.php
index 696b04e..3a23db9 100644
--- a/src/BehaviorSettingsManagerInterface.php
+++ b/src/BehaviorSettingsManagerInterface.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\rabbit_hole\BehaviourSettingsManagerInterface.
- */
-
 namespace Drupal\rabbit_hole;
 
 /**
diff --git a/src/Entity/BehaviorSettings.php b/src/Entity/BehaviorSettings.php
index 715c796..e76ae0d 100644
--- a/src/Entity/BehaviorSettings.php
+++ b/src/Entity/BehaviorSettings.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\rabbit_hole\Entity\BehaviorSettings.
- */
-
 namespace Drupal\rabbit_hole\Entity;
 
 use Drupal\Core\Config\Entity\ConfigEntityBase;
diff --git a/src/EntityExtender.php b/src/EntityExtender.php
index 8a94eb8..8888426 100644
--- a/src/EntityExtender.php
+++ b/src/EntityExtender.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\rabbit_hole\EntityExtender.
- */
-
 namespace Drupal\rabbit_hole;
 
 use Drupal\Core\Field\BaseFieldDefinition;
diff --git a/src/EntityExtenderInterface.php b/src/EntityExtenderInterface.php
index cf223d2..2a85780 100644
--- a/src/EntityExtenderInterface.php
+++ b/src/EntityExtenderInterface.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\rabbit_hole\EntityExtenderInterface.
- */
-
 namespace Drupal\rabbit_hole;
 
 /**
@@ -13,6 +8,7 @@ namespace Drupal\rabbit_hole;
  * @package Drupal\rabbit_hole
  */
 interface EntityExtenderInterface {
+
   /**
    * Get the extra fields that should be applied to all rabbit hole entities.
    */
diff --git a/src/EventSubscriber/RabbitHoleSubscriber.php b/src/EventSubscriber/RabbitHoleSubscriber.php
index 56f6e57..2b01af4 100644
--- a/src/EventSubscriber/RabbitHoleSubscriber.php
+++ b/src/EventSubscriber/RabbitHoleSubscriber.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\rabbit_hole\EventSubscriber.
- */
-
 namespace Drupal\rabbit_hole\EventSubscriber;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
diff --git a/src/Exception/InvalidBehaviorSettingException.php b/src/Exception/InvalidBehaviorSettingException.php
index 1a4d447..a48ee6b 100644
--- a/src/Exception/InvalidBehaviorSettingException.php
+++ b/src/Exception/InvalidBehaviorSettingException.php
@@ -1,20 +1,18 @@
 <?php
-/**
- * @file
- * Contains \Drupal\rabbit_hole\Exception\InvalidBehaviorSettingException.
- */
 
 namespace Drupal\rabbit_hole\Exception;
 
 /**
- * TODO.
+ * Class InvalidBehaviorSettingException.
+ *
+ * @package Drupal\rabbit_hole
  */
 class InvalidBehaviorSettingException extends \Exception {
 
   private $setting;
 
   /**
-   * TODO.
+   * Constructor.
    */
   public function __construct($setting) {
     parent::__construct();
@@ -22,7 +20,7 @@ class InvalidBehaviorSettingException extends \Exception {
   }
 
   /**
-   * TODO.
+   * Get the invalid setting.
    */
   public function getSetting() {
     return $this->setting();
diff --git a/src/Exception/InvalidRedirectResponseException.php b/src/Exception/InvalidRedirectResponseException.php
index 845a6d4..c2dadd3 100644
--- a/src/Exception/InvalidRedirectResponseException.php
+++ b/src/Exception/InvalidRedirectResponseException.php
@@ -1,18 +1,16 @@
 <?php
-/**
- * @file
- * Contains \Drupal\rabbit_hole\Exception\InvalidRedirectResponseException.
- */
 
 namespace Drupal\rabbit_hole\Exception;
 
 /**
- * TODO.
+ * Class InvalidRedirectResponseException.
+ *
+ * @package Drupal\rabbit_hole
  */
 class InvalidRedirectResponseException extends \Exception {
 
   /**
-   * TODO.
+   * Constructor.
    */
   public function __construct($message = NULL, $code = 0, Exception $previous = NULL) {
     parent::__construct($message, $code, $previous);
diff --git a/src/FormManglerService.php b/src/FormManglerService.php
index cc986cb..f83b555 100644
--- a/src/FormManglerService.php
+++ b/src/FormManglerService.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\rabbit_hole\FormManglerService.
- */
-
 namespace Drupal\rabbit_hole;
 
 use Drupal\Core\Entity\Entity;
@@ -13,7 +8,6 @@ use Drupal\Core\Entity\EntityTypeManager;
 use Drupal\Core\Entity\EntityTypeBundleInfo;
 use Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPluginManager;
 use Drupal\rabbit_hole\Plugin\RabbitHoleEntityPluginManager;
-use Drupal\rabbit_hole\BehaviorSettingsManager;
 use Drupal\rabbit_hole\Entity\BehaviorSettings;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\StringTranslation\TranslationInterface;
diff --git a/src/Plugin/RabbitHoleBehaviorPlugin/AccessDenied.php b/src/Plugin/RabbitHoleBehaviorPlugin/AccessDenied.php
index e06dc34..80f3e99 100644
--- a/src/Plugin/RabbitHoleBehaviorPlugin/AccessDenied.php
+++ b/src/Plugin/RabbitHoleBehaviorPlugin/AccessDenied.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains \Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPlugin\AccessDenied.
- */
 
 namespace Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPlugin;
 
diff --git a/src/Plugin/RabbitHoleBehaviorPlugin/DisplayPage.php b/src/Plugin/RabbitHoleBehaviorPlugin/DisplayPage.php
index 9e8c8d8..68f13b7 100644
--- a/src/Plugin/RabbitHoleBehaviorPlugin/DisplayPage.php
+++ b/src/Plugin/RabbitHoleBehaviorPlugin/DisplayPage.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains \Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPlugin\DisplayPage.
- */
 
 namespace Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPlugin;
 
diff --git a/src/Plugin/RabbitHoleBehaviorPlugin/PageNotFound.php b/src/Plugin/RabbitHoleBehaviorPlugin/PageNotFound.php
index 6a74c82..7cf0354 100644
--- a/src/Plugin/RabbitHoleBehaviorPlugin/PageNotFound.php
+++ b/src/Plugin/RabbitHoleBehaviorPlugin/PageNotFound.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains \Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPlugin\PageNotFound.
- */
 
 namespace Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPlugin;
 
diff --git a/src/Plugin/RabbitHoleBehaviorPlugin/PageRedirect.php b/src/Plugin/RabbitHoleBehaviorPlugin/PageRedirect.php
index fa715b6..40ce8bb 100644
--- a/src/Plugin/RabbitHoleBehaviorPlugin/PageRedirect.php
+++ b/src/Plugin/RabbitHoleBehaviorPlugin/PageRedirect.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains \Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPlugin\PageRedirect.
- */
 
 namespace Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPlugin;
 
@@ -56,9 +52,9 @@ class PageRedirect extends RabbitHoleBehaviorPluginBase implements ContainerFact
   private $code;
 
   /**
-   * The behavior settings manager
+   * The behavior settings manager.
    *
-   * Drupal\rabbit_hole\BehaviorSettingsManagerInterface
+   * @var Drupal\rabbit_hole\BehaviorSettingsManagerInterface
    */
   protected $rhBehaviorSettingsManager;
 
@@ -72,7 +68,7 @@ class PageRedirect extends RabbitHoleBehaviorPluginBase implements ContainerFact
   }
 
   /**
-   *{@inheritdoc}
+   * {@inheritdoc}
    */
   public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
     return new static (
diff --git a/src/Plugin/RabbitHoleBehaviorPluginBase.php b/src/Plugin/RabbitHoleBehaviorPluginBase.php
index b0adb44..fe57e3b 100644
--- a/src/Plugin/RabbitHoleBehaviorPluginBase.php
+++ b/src/Plugin/RabbitHoleBehaviorPluginBase.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains \Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPluginBase.
- */
 
 namespace Drupal\rabbit_hole\Plugin;
 
diff --git a/src/Plugin/RabbitHoleBehaviorPluginInterface.php b/src/Plugin/RabbitHoleBehaviorPluginInterface.php
index 5ed5444..f893e91 100644
--- a/src/Plugin/RabbitHoleBehaviorPluginInterface.php
+++ b/src/Plugin/RabbitHoleBehaviorPluginInterface.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPluginInterface.
- */
-
 namespace Drupal\rabbit_hole\Plugin;
 
 use Drupal\Core\Entity\Entity;
diff --git a/src/Plugin/RabbitHoleBehaviorPluginManager.php b/src/Plugin/RabbitHoleBehaviorPluginManager.php
index 333b71c..1d23f18 100644
--- a/src/Plugin/RabbitHoleBehaviorPluginManager.php
+++ b/src/Plugin/RabbitHoleBehaviorPluginManager.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains \Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPluginManager.
- */
 
 namespace Drupal\rabbit_hole\Plugin;
 
diff --git a/src/Plugin/RabbitHoleEntityPluginBase.php b/src/Plugin/RabbitHoleEntityPluginBase.php
index 39b6a35..78f6410 100644
--- a/src/Plugin/RabbitHoleEntityPluginBase.php
+++ b/src/Plugin/RabbitHoleEntityPluginBase.php
@@ -1,19 +1,14 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\rabbit_hole\Plugin\RabbitHoleEntityPluginBase.
- */
-
 namespace Drupal\rabbit_hole\Plugin;
 
 use Drupal\Component\Plugin\PluginBase;
-use Drupal\rabbit_hole\Plugin\RabbitHoleEntityPluginInterface;
 
 /**
  * Base class for Rabbit hole entity plugin plugins.
  */
 abstract class RabbitHoleEntityPluginBase extends PluginBase implements RabbitHoleEntityPluginInterface {
+
   /**
    * {@inheritdoc}
    */
diff --git a/src/Plugin/RabbitHoleEntityPluginInterface.php b/src/Plugin/RabbitHoleEntityPluginInterface.php
index 4a9d08a..a85e0aa 100644
--- a/src/Plugin/RabbitHoleEntityPluginInterface.php
+++ b/src/Plugin/RabbitHoleEntityPluginInterface.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\rabbit_hole\Plugin\RabbitHoleEntityPluginInterface.
- */
-
 namespace Drupal\rabbit_hole\Plugin;
 
 use Drupal\Component\Plugin\PluginInspectionInterface;
diff --git a/src/Plugin/RabbitHoleEntityPluginManager.php b/src/Plugin/RabbitHoleEntityPluginManager.php
index 707eb90..aa14eeb 100644
--- a/src/Plugin/RabbitHoleEntityPluginManager.php
+++ b/src/Plugin/RabbitHoleEntityPluginManager.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\rabbit_hole\Plugin\RabbitHoleEntityPluginManager.
- */
-
 namespace Drupal\rabbit_hole\Plugin;
 
 use Drupal\Core\Plugin\DefaultPluginManager;
diff --git a/src/RabbitHolePermissionGenerator.php b/src/RabbitHolePermissionGenerator.php
index 00f68c4..0675470 100644
--- a/src/RabbitHolePermissionGenerator.php
+++ b/src/RabbitHolePermissionGenerator.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\rabbit_hole\RabbitHoleGeneratedPermissions.
- */
-
 namespace Drupal\rabbit_hole;
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -14,6 +9,11 @@ use Drupal\rabbit_hole\Plugin\RabbitHoleEntityPluginManager;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\StringTranslation\TranslationInterface;
 
+/**
+ * Class RabbitHolePermissionGenerator.
+ *
+ * @package Drupal\rabbit_hole
+ */
 class RabbitHolePermissionGenerator implements ContainerInjectionInterface {
   use StringTranslationTrait;
 
@@ -45,9 +45,10 @@ class RabbitHolePermissionGenerator implements ContainerInjectionInterface {
   }
 
   /**
-   * Return an array of per-entity rabbit hole permissions
+   * Return an array of per-entity rabbit hole permissions.
+   *
    * @return array
-   *  An array of permissions
+   *   An array of permissions
    */
   public function permissions() {
     $permissions = [];
@@ -57,19 +58,20 @@ class RabbitHolePermissionGenerator implements ContainerInjectionInterface {
               ->getStorage($def['entityType'])
               ->getEntityType();
       $permissions += array(
-          'rabbit hole administer ' . $def['entityType'] => array(
-              'title' => $this->t(
+        'rabbit hole administer ' . $def['entityType'] => array(
+          'title' => $this->t(
                       'Administer Rabbit Hole settings for %entity_type',
                       array('%entity_type' => $entity_type->getLabel())),
-          ),
-          'rabbit hole bypass ' . $def['entityType'] => array(
-              'title' => $this->t(
+        ),
+        'rabbit hole bypass ' . $def['entityType'] => array(
+          'title' => $this->t(
                       'Bypass Rabbit Hole action for %entity_type',
                       array('%entity_type' => $entity_type->getLabel())),
-          )
+        ),
       );
     }
 
     return $permissions;
   }
-}
\ No newline at end of file
+
+}
diff --git a/src/Tests/RabbitHoleBehaviorPluginTest.php b/src/Tests/RabbitHoleBehaviorPluginTest.php
index 13c3ab3..cb95ebd 100644
--- a/src/Tests/RabbitHoleBehaviorPluginTest.php
+++ b/src/Tests/RabbitHoleBehaviorPluginTest.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains \Drupal\rabbit_hole\Tests\RabbitHoleBehaviorPluginTest.
- */
 
 namespace Drupal\rabbit_hole\Tests;
 
diff --git a/src/Tests/RabbitHoleBehaviorSettingsEntityMethodsTest.php b/src/Tests/RabbitHoleBehaviorSettingsEntityMethodsTest.php
index 01e4830..01419e6 100644
--- a/src/Tests/RabbitHoleBehaviorSettingsEntityMethodsTest.php
+++ b/src/Tests/RabbitHoleBehaviorSettingsEntityMethodsTest.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains \Drupal\rabbit_hole\Tests\RabbitHoleBehaviorSettingsEntityMethodsTest.
- */
 
 namespace Drupal\rabbit_hole\Tests;
 
diff --git a/src/Tests/RabbitHoleBehaviorSettingsTest.php b/src/Tests/RabbitHoleBehaviorSettingsTest.php
index 42dd0a8..0a50225 100644
--- a/src/Tests/RabbitHoleBehaviorSettingsTest.php
+++ b/src/Tests/RabbitHoleBehaviorSettingsTest.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains \Drupal\rabbit_hole\Tests\RabbitHoleBehaviorSettingsTest.
- */
 
 namespace Drupal\rabbit_hole\Tests;