diff --git a/README.md b/README.md
index 9b085c1..441307a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
 Drupal Deploy 8.x
 =================
 
-[![Build Status](https://travis-ci.org/dickolsson/drupal-deploy.svg?branch=8.x-0.x)](https://travis-ci.org/dickolsson/drupal-deploy)
+[![Build Status]
+(https://travis-ci.org/dickolsson/drupal-deploy.svg?branch=8.x-0.x)]
+(https://travis-ci.org/dickolsson/drupal-deploy)
diff --git a/css/deploy.toolbar.css b/css/deploy.toolbar.css
index 1e96601..e8c6eea 100644
--- a/css/deploy.toolbar.css
+++ b/css/deploy.toolbar.css
@@ -4,9 +4,9 @@
  */
 
 .toolbar-bar .toolbar-icon-deploy:before {
-    background-image: url("../icons/bebebe/deploy.svg");
+  background-image: url("../icons/bebebe/deploy.svg");
 }
 
 .toolbar .toolbar-bar .deploy-toolbar-tab.toolbar-tab {
-    float: right;
+  float: right;
 }
diff --git a/deploy.module b/deploy.module
index a0746c6..119e204 100644
--- a/deploy.module
+++ b/deploy.module
@@ -52,8 +52,8 @@ function deploy_entity_type_alter(array &$entity_types) {
   if (!empty($entity_types['replication'])) {
     /** @var \Drupal\Core\Entity\EntityTypeInterface $replication */
     $replication = $entity_types['replication'];
-    $replication ->setHandlerClass('list_builder', 'Drupal\deploy\ReplicationListBuilder');
-    $replication ->setHandlerClass('view_builder', 'Drupal\deploy\Entity\ReplicationViewBuilder');
+    $replication->setHandlerClass('list_builder', 'Drupal\deploy\ReplicationListBuilder');
+    $replication->setHandlerClass('view_builder', 'Drupal\deploy\Entity\ReplicationViewBuilder');
     $replication->setHandlerClass('access', 'Drupal\deploy\ReplicationAccessControlHandler');
     $replication->setHandlerClass('route_provider', ['html' => 'Drupal\Core\Entity\Routing\AdminHtmlRouteProvider']);
     $replication->setHandlerClass('form', [
@@ -69,4 +69,4 @@ function deploy_entity_type_alter(array &$entity_types) {
     $replication->set('field_ui_base_route', 'entity.replication.collection');
     $replication->set('admin_permission', 'administer workspaces');
   }
-}
\ No newline at end of file
+}
diff --git a/deploy.routing.yml b/deploy.routing.yml
index 93bbd7c..4f82720 100644
--- a/deploy.routing.yml
+++ b/deploy.routing.yml
@@ -17,4 +17,4 @@ entity.replication.add_form:
   requirements:
     _permission: 'administer deployments'
   options:
-    _admin_route: TRUE
\ No newline at end of file
+    _admin_route: TRUE
diff --git a/src/Entity/Form/ReplicationDeleteForm.php b/src/Entity/Form/ReplicationDeleteForm.php
index 6dd255f..cfef0a2 100644
--- a/src/Entity/Form/ReplicationDeleteForm.php
+++ b/src/Entity/Form/ReplicationDeleteForm.php
@@ -12,6 +12,7 @@ use Drupal\Core\Url;
  * @ingroup deploy
  */
 class ReplicationDeleteForm extends ContentEntityConfirmFormBase {
+
   /**
    * {@inheritdoc}
    */
@@ -43,7 +44,7 @@ class ReplicationDeleteForm extends ContentEntityConfirmFormBase {
       $this->t('@type: deleted @label.',
         [
           '@type' => $this->entity->bundle(),
-          '@label' => $this->entity->label()
+          '@label' => $this->entity->label(),
         ]
         )
     );
diff --git a/src/Entity/Form/ReplicationForm.php b/src/Entity/Form/ReplicationForm.php
index 45eefb3..efeae87 100644
--- a/src/Entity/Form/ReplicationForm.php
+++ b/src/Entity/Form/ReplicationForm.php
@@ -20,12 +20,23 @@ use Drupal\workspace\WorkspacePointerInterface;
  */
 class ReplicationForm extends ContentEntityForm {
 
-  /** @var  WorkspacePointerInterface */
-  protected $source = null;
+  /**
+   * The Workspace Pointer Interface.
+   *
+   * @var \Drupal\workspace\WorkspacePointerInterface
+   */
+  protected $source = NULL;
 
-  /** @var  WorkspacePointerInterface */
-  protected $target = null;
+  /**
+   * The Workspace Pointer Interface.
+   *
+   * @var \Drupal\workspace\WorkspacePointerInterface
+   */
+  protected $target = NULL;
 
+  /**
+   * {@inheritdoc}
+   */
   public function addTitle() {
     $this->setEntity(Replication::create());
     if (!$this->getDefaultSource() || !$this->getDefaultTarget()) {
@@ -33,7 +44,7 @@ class ReplicationForm extends ContentEntityForm {
     }
     return $this->t('Deploy @source to @target', [
       '@source' => $this->getDefaultSource()->label(),
-      '@target' => $this->getDefaultTarget()->label()
+      '@target' => $this->getDefaultTarget()->label(),
     ]);
   }
 
@@ -49,8 +60,7 @@ class ReplicationForm extends ContentEntityForm {
     $default_source = $this->getDefaultSource();
     $default_target = $this->getDefaultTarget();
     if (!$default_source || !$default_target) {
-      $message = 'Source and target must be set, make sure your current workspace has an upstream. Go to <a href=":path">this page</a> to edit your workspaces.';
-      $message = $this->t($message, [':path' => Url::fromRoute('entity.workspace.collection')->toString()]);
+      $message = $this->t('Source and target must be set, make sure your current workspace has an upstream. Go to <a href=":path">this page</a> to edit your workspaces.', [':path' => Url::fromRoute('entity.workspace.collection')->toString()]);
       if ($js) {
         return ['#markup' => $message];
       }
@@ -122,7 +132,7 @@ class ReplicationForm extends ContentEntityForm {
     // Pass the abort flag to the ReplicationManager using runtime-only state,
     // i.e. a static.
     // @see \Drupal\workspace\ReplicatorManager
-	  // @see \Drupal\workspace\Entity\Form\WorkspaceForm
+    // @see \Drupal\workspace\Entity\Form\WorkspaceForm
     $is_aborted_on_conflict = !$form_state->hasValue('is_aborted_on_conflict') || $form_state->getValue('is_aborted_on_conflict') === 'true';
     drupal_static('workspace_is_aborted_on_conflict', $is_aborted_on_conflict);
 
@@ -150,7 +160,7 @@ class ReplicationForm extends ContentEntityForm {
         }
       }
     }
-    catch(\Exception $e) {
+    catch (\Exception $e) {
       watchdog_exception('Deploy', $e);
       drupal_set_message($e->getMessage(), 'error');
     }
@@ -161,7 +171,10 @@ class ReplicationForm extends ContentEntityForm {
   }
 
   /**
-   * @return \Drupal\Core\Ajax\AjaxResponse
+   * {@inheritdoc}
+   *
+   * @return string
+   *   \Drupal\Core\Ajax\AjaxResponse
    */
   public function deploy() {
     $response = new AjaxResponse();
@@ -171,6 +184,9 @@ class ReplicationForm extends ContentEntityForm {
     return $response;
   }
 
+  /**
+   * {@inheritdoc}
+   */
   protected function getDefaultSource() {
     if (!empty($this->source)) {
       return $this->source;
@@ -180,7 +196,7 @@ class ReplicationForm extends ContentEntityForm {
       return $this->source = $this->entity->get('source')->entity;
     }
 
-    /** @var \Drupal\multiversion\Entity\Workspace $workspace ; */
+    /* @var \Drupal\multiversion\Entity\Workspace $workspace ; */
     $workspace = \Drupal::service('workspace.manager')->getActiveWorkspace();
     $workspace_pointers = \Drupal::service('entity_type.manager')
       ->getStorage('workspace_pointer')
@@ -188,6 +204,9 @@ class ReplicationForm extends ContentEntityForm {
     return $this->source = reset($workspace_pointers);
   }
 
+  /**
+   * {@inheritdoc}
+   */
   protected function getDefaultTarget() {
     if (!empty($this->target)) {
       return $this->target;
@@ -197,7 +216,7 @@ class ReplicationForm extends ContentEntityForm {
       return $this->target = $this->entity->get('target')->entity;
     }
 
-    /** @var \Drupal\multiversion\Entity\Workspace $workspace ; */
+    /* @var \Drupal\multiversion\Entity\Workspace $workspace ; */
     $workspace = \Drupal::service('workspace.manager')->getActiveWorkspace();
     return $this->target = $workspace->get('upstream')->entity;
   }
diff --git a/src/Entity/ReplicationViewBuilder.php b/src/Entity/ReplicationViewBuilder.php
index ccb6156..41621df 100644
--- a/src/Entity/ReplicationViewBuilder.php
+++ b/src/Entity/ReplicationViewBuilder.php
@@ -10,11 +10,21 @@ use Drupal\Core\Form\FormBuilderInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
+/**
+ * {@inheritdoc}
+ */
 class ReplicationViewBuilder extends EntityViewBuilder {
 
-  /** @var FormBuilderInterface $formBuilder **/
+  /**
+   * The Form Builder Interface.
+   *
+   * @var \Drupal\Core\Form\FormBuilderInterface
+   */
   protected $formBuilder;
 
+  /**
+   * {@inheritdoc}
+   */
   public function __construct(EntityTypeInterface $entity_type, EntityManagerInterface $entity_manager, LanguageManagerInterface $language_manager, FormBuilderInterface $form_builder) {
     parent::__construct($entity_type, $entity_manager, $language_manager);
     $this->formBuilder = $form_builder;
@@ -29,7 +39,8 @@ class ReplicationViewBuilder extends EntityViewBuilder {
       $container->get('entity.manager'),
       $container->get('language_manager'),
       $container->get('form_builder')
-    );  }
+    );
+  }
 
   /**
    * {@inheritdoc}
diff --git a/src/Entity/ReplicationViewsData.php b/src/Entity/ReplicationViewsData.php
index a80a715..56e2adc 100644
--- a/src/Entity/ReplicationViewsData.php
+++ b/src/Entity/ReplicationViewsData.php
@@ -9,6 +9,7 @@ use Drupal\views\EntityViewsDataInterface;
  * Provides Views data for Replication entities.
  */
 class ReplicationViewsData extends EntityViewsData implements EntityViewsDataInterface {
+
   /**
    * {@inheritdoc}
    */
diff --git a/src/Form/ReplicationActionForm.php b/src/Form/ReplicationActionForm.php
index 817c556..eb00df4 100644
--- a/src/Form/ReplicationActionForm.php
+++ b/src/Form/ReplicationActionForm.php
@@ -8,7 +8,6 @@ use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\Markup;
 use Drupal\Core\Url;
-use Drupal\multiversion\Entity\WorkspaceInterface;
 use Drupal\multiversion\Workspace\ConflictTrackerInterface;
 use Drupal\multiversion\Workspace\WorkspaceManagerInterface;
 use Drupal\replication\Entity\ReplicationLogInterface;
@@ -16,31 +15,42 @@ use Drupal\workspace\Entity\Replication;
 use Drupal\workspace\WorkspacePointerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
+/**
+ * {@inheritdoc}
+ */
 class ReplicationActionForm extends FormBase {
 
   /**
    * The injected service to track conflicts during replication.
    *
-   * @var ConflictTrackerInterface
+   * @var \Drupal\multiversion\Workspace\ConflictTrackerInterface
    */
   protected $conflictTracker;
 
   /**
-   * @var  WorkspacePointerInterface
+   * The Workspace Pointer Interface.
+   *
+   * @var \Drupal\workspace\WorkspacePointerInterface
    */
-  protected $source = null;
+  protected $source = NULL;
 
   /**
-   * @var  WorkspacePointerInterface
+   * The Workspace Pointer Interface.
+   *
+   * @var \Drupal\workspace\WorkspacePointerInterface
    */
-  protected $target = null;
+  protected $target = NULL;
 
   /**
+   * The Entity Type Manager Interface.
+   *
    * @var \Drupal\Core\Entity\EntityTypeManagerInterface
    */
   protected $entityTypeManager;
 
   /**
+   * The Workspace Manager Interface.
+   *
    * @var \Drupal\multiversion\Workspace\WorkspaceManagerInterface
    */
   protected $workspaceManager;
@@ -48,10 +58,12 @@ class ReplicationActionForm extends FormBase {
   /**
    * Constructs a ContentEntityForm object.
    *
-   * @param ConflictTrackerInterface $conflict_tracker
+   * @param \Drupal\multiversion\Workspace\ConflictTrackerInterface $conflict_tracker
    *   The conflict tracking service.
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager service.
    * @param \Drupal\multiversion\Workspace\WorkspaceManagerInterface $workspace_manager
+   *   The workspace manager service.
    */
   public function __construct(ConflictTrackerInterface $conflict_tracker, EntityTypeManagerInterface $entity_type_manager, WorkspaceManagerInterface $workspace_manager) {
     $this->conflictTracker = $conflict_tracker;
@@ -71,7 +83,7 @@ class ReplicationActionForm extends FormBase {
   }
 
   /**
-   * {@inheritDoc}
+   * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
     $entity = $this->getEntity($form_state);
@@ -79,7 +91,7 @@ class ReplicationActionForm extends FormBase {
     $form['#weight'] = 9999;
     $form['replication_id'] = [
       '#type' => 'hidden',
-      '#value' => $entity->id()
+      '#value' => $entity->id(),
     ];
 
     // Allow the user to not abort on conflicts.
@@ -119,25 +131,25 @@ class ReplicationActionForm extends FormBase {
   }
 
   /**
-   * {@inheritDoc}
+   * {@inheritdoc}
    */
   public function getFormId() {
     return 'replication_action';
   }
 
   /**
-   * {@inheritDoc}
+   * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     // Pass the abort flag to the ReplicationManager using runtime-only state,
     // i.e. a static.
     // @see \Drupal\workspace\ReplicatorManager
-	  // @see \Drupal\workspace\Entity\Form\WorkspaceForm
+    // @see \Drupal\workspace\Entity\Form\WorkspaceForm
     $is_aborted_on_conflict = !$form_state->hasValue('is_aborted_on_conflict') || $form_state->getValue('is_aborted_on_conflict') === 'true';
     drupal_static('workspace_is_aborted_on_conflict', $is_aborted_on_conflict);
 
     $entity = $this->getEntity($form_state);
-    /** @var ReplicationLogInterface $response */
+    /** @var \Drupal\replication\Entity\ReplicationLogInterface $response */
     $response = \Drupal::service('workspace.replicator_manager')->replicate(
         $entity->get('source')->entity,
         $entity->get('target')->entity
@@ -156,9 +168,12 @@ class ReplicationActionForm extends FormBase {
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
   protected function getEntity(FormStateInterface $form_state) {
     $args = $form_state->getBuildInfo()['args'];
-    /** @var Replication $entity */
+    /** @var \Drupal\workspace\Entity\Replication $entity */
     $entity = $args[0];
     if ($entity instanceof Replication) {
       return $entity;
@@ -188,6 +203,9 @@ class ReplicationActionForm extends FormBase {
     ];
   }
 
+  /**
+   * {@inheritdoc}
+   */
   protected function getDefaultSource(FormStateInterface $form_state) {
     if (!empty($this->source)) {
       return $this->source;
@@ -205,6 +223,9 @@ class ReplicationActionForm extends FormBase {
     return $this->source = reset($workspace_pointers);
   }
 
+  /**
+   * {@inheritdoc}
+   */
   protected function getDefaultTarget(FormStateInterface $form_state) {
     if (!empty($this->target)) {
       return $this->target;
diff --git a/src/ReplicationAccessControlHandler.php b/src/ReplicationAccessControlHandler.php
index a525a2d..920214d 100644
--- a/src/ReplicationAccessControlHandler.php
+++ b/src/ReplicationAccessControlHandler.php
@@ -8,7 +8,11 @@ use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Session\AccountInterface;
 
+/**
+ * {@inheritdoc}
+ */
 class ReplicationAccessControlHandler extends EntityAccessControlHandler {
+
   /**
    * {@inheritdoc}
    */
@@ -19,7 +23,7 @@ class ReplicationAccessControlHandler extends EntityAccessControlHandler {
       return AccessResult::forbidden();
     }
 
-
     return parent::checkFieldAccess($operation, $field_definition, $account, $items);
   }
-}
\ No newline at end of file
+
+}
diff --git a/src/Tests/ReplicationEntityTest.php b/src/Tests/ReplicationEntityTest.php
index 76beb62..0e0a30d 100644
--- a/src/Tests/ReplicationEntityTest.php
+++ b/src/Tests/ReplicationEntityTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\deploy\Tests;
 
-use Drupal\multiversion\Entity\Workspace;
 use Drupal\simpletest\WebTestBase;
 
 /**
@@ -16,6 +15,9 @@ class ReplicationEntityTest extends WebTestBase {
 
   public static $modules = ['deploy'];
 
+  /**
+   * {@inheritdoc}
+   */
   public function testReplication() {
     $this->webUser = $this->drupalCreateUser([
       'administer workspaces',
@@ -28,11 +30,12 @@ class ReplicationEntityTest extends WebTestBase {
 
     $this->drupalGet('admin/structure/deployment/add');
     $deployment = [
-      'name[0][value]' => 'Test Deployment'
+      'name[0][value]' => 'Test Deployment',
     ];
     $this->drupalPostForm('admin/structure/deployment/add', $deployment, t('Deploy to Live'));
 
     $this->drupalGet('admin/structure/deployment');
     $this->assertText($deployment['name[0][value]'], 'Deployment found in list of deployments');
   }
-}
\ No newline at end of file
+
+}
diff --git a/tests/src/Functional/WorkspaceConflictReportingTest.php b/tests/src/Functional/WorkspaceConflictReportingTest.php
index 3ffc3b7..4d06d9b 100644
--- a/tests/src/Functional/WorkspaceConflictReportingTest.php
+++ b/tests/src/Functional/WorkspaceConflictReportingTest.php
@@ -74,7 +74,11 @@ class WorkspaceConflictReportingTest extends BrowserTestBase {
     $live->set('upstream', $stage->id());
     $live->save();
 
-    $vocabulary = Vocabulary::create(['name' => 'Tags', 'vid' => 'tags', 'hierarchy' => 0]);
+    $vocabulary = Vocabulary::create([
+      'name' => 'Tags',
+      'vid' => 'tags',
+      'hierarchy' => 0,
+    ]);
     $vocabulary->save();
 
     $node = Node::create(['type' => 'test', 'title' => 'Node title']);
@@ -91,7 +95,7 @@ class WorkspaceConflictReportingTest extends BrowserTestBase {
     $this->drupalGet('admin/structure/deployment/add');
     $this->assertSession()->pageTextContains('There are no conflicts.');
     $deployment = [
-      'name[0][value]' => 'Deploy Live to Stage'
+      'name[0][value]' => 'Deploy Live to Stage',
     ];
     $this->drupalPostForm('admin/structure/deployment/add', $deployment, t('Deploy to Stage'));
 
@@ -121,7 +125,7 @@ class WorkspaceConflictReportingTest extends BrowserTestBase {
     $this->drupalGet('admin/structure/deployment/add');
     $this->assertSession()->pageTextContains('There are no conflicts.');
     $deployment = [
-      'name[0][value]' => 'Deploy Stage to Live'
+      'name[0][value]' => 'Deploy Stage to Live',
     ];
     $this->drupalPostForm('admin/structure/deployment/add', $deployment, t('Deploy to Live'));