diff --git a/core/modules/moderation/moderation.module b/core/modules/moderation/moderation.module
index a264243..a6a2fb7 100644
--- a/core/modules/moderation/moderation.module
+++ b/core/modules/moderation/moderation.module
@@ -1,14 +1,15 @@
 <?php
-
 /**
  * @file
- * Moderation of revisionable entities.
+ * The core module that allows moderation of revision-able entities.
  */
 
 use \Drupal\node\NodeInterface;
 
 /**
  * Implements hook_entity_type_alter().
+ *
+ * @todo: support other revision-able entities.
  */
 function moderation_entity_type_alter(array &$entity_types) {
   if (isset($entity_types['node'])) {
@@ -29,11 +30,13 @@ function moderation_entity_type_alter(array &$entity_types) {
  * Draft is simply defined here as an unpublished revision that is newer than
  * the published node.
  *
- * @param \Drupal\core\NodeInterface $node
+ * @param \Drupal\node\NodeInterface $node
  *   The node object.
  *
  * @return bool|int
  *   The revision ID if a draft exists, otherwise FALSE.
+ *
+ * @todo: Make this more abstract and move logic to a service.
  */
 function moderation_node_has_draft(NodeInterface $node) {
   $current_revision = $node->getRevisionId();
diff --git a/core/modules/moderation/src/Access/DraftAccess.php b/core/modules/moderation/src/Access/DraftAccess.php
index 13bd137..0ef04e8 100644
--- a/core/modules/moderation/src/Access/DraftAccess.php
+++ b/core/modules/moderation/src/Access/DraftAccess.php
@@ -15,6 +15,8 @@
 
 /**
  * Provides an access checker for node revisions.
+ *
+ * @todo: Abstract and add an interface so other entities can inherit it.
  */
 class DraftAccess implements AccessInterface {
 
@@ -51,5 +53,4 @@ public function access(Route $route, AccountInterface $account, NodeInterface $n
     // has a draft.
     return AccessResult::allowedIf($node->access('update', $account) && moderation_node_has_draft($node));
   }
-
 }
diff --git a/core/modules/moderation/src/Form/NodeForm.php b/core/modules/moderation/src/Form/NodeForm.php
index 4545a25..05c3b8e 100644
--- a/core/modules/moderation/src/Form/NodeForm.php
+++ b/core/modules/moderation/src/Form/NodeForm.php
@@ -102,7 +102,7 @@ public function publish(array $form, FormStateInterface $form_state) {
   public function setRedirect(array $form, FormStateInterface $form_state) {
     $form_state->setRedirect(
       'node.draft',
-      array('node' => $this->getEntity()->id())
+      ['node' => $this->getEntity()->id()]
     );
   }
 
@@ -116,10 +116,8 @@ protected function nodeTypeUnpublishedDefault() {
     $type = $this->getEntity()->getType();
     // @todo Make it possible to get default values without an entity.
     //   https://www.drupal.org/node/2318187
-    $node = $this->entityManager->getStorage('node')->create(array('type' => $type));
+    $node = $this->entityManager->getStorage('node')->create(['type' => $type]);
     return !$node->isPublished();
   }
 
 }
-
-
diff --git a/core/modules/moderation/src/Tests/ModerationNodeTest.php b/core/modules/moderation/src/Tests/ModerationNodeTest.php
index aee316d..f7818a2 100644
--- a/core/modules/moderation/src/Tests/ModerationNodeTest.php
+++ b/core/modules/moderation/src/Tests/ModerationNodeTest.php
@@ -33,7 +33,7 @@ class ModerationNodeTest extends NodeTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('node', 'moderation');
+  public static $modules = ['node', 'moderation'];
 
   /**
    * {@inheritdoc}