diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index fed5c5b..a454af3 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -1670,7 +1670,8 @@ function template_preprocess_comment(&$variables) {
     $variables['parent_permalink'] = l(t('Parent permalink'), $uri_parent['path'], $uri_parent['options']);
     $variables['parent'] = t('In reply to !parent_title by !parent_username',
         array('!parent_username' => $variables['parent_author'], '!parent_title' => $variables['parent_title']));
-  } else {
+  }
+  else {
     $variables['parent_comment'] = '';
     $variables['parent_author'] = '';
     $variables['parent_created'] = '';
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentThreadingTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentThreadingTest.php
index 975cf10..ba03951 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentThreadingTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentThreadingTest.php
@@ -90,7 +90,7 @@ function testCommentThreading() {
     $this->assertTrue($this->commentExists($comment5), 'Comment #5. Second comment found.');
     $this->assertEqual($comment5_loaded->thread, '02/');
     // Confirm that there is no link to a parent comment.
-    $this->assertNoParentLink($comment2->id);
+    $this->assertNoParentLink($comment5->id);
 
     // Reply to comment #5 creating comment #6.
     $this->drupalLogin($this->web_user);
diff --git a/core/modules/comment/templates/comment.tpl.php b/core/modules/comment/templates/comment.tpl.php
index 4e44b4a..890e457 100644
--- a/core/modules/comment/templates/comment.tpl.php
+++ b/core/modules/comment/templates/comment.tpl.php
@@ -43,18 +43,19 @@
  *   modules, intended to be displayed after the main title tag that appears in
  *   the template.
  *
- * These variables are provided to give context about the parent comment (if any):
- * $comment_parent: Full parent comment object (if any).
+ * These variables are provided to give context about the parent comment (if
+ * any):
+ * - $comment_parent: Full parent comment object (if any).
  * - $parent_author: Equivalent to $author for the parent comment.
  * - $parent_created: Equivalent to $created for the parent comment.
  * - $parent_changed: Equivalent to $changed for the parent comment.
  * - $parent_title: Equivalent to $title for the parent comment.
  * - $parent_permalink: Equivalent to $permalink for the parent comment.
- * - $parent: Parent comment submission information created from
- *   $parent_author and $parent_created during template_preprocess_comment().
- * This information is presented to help screen readers follow lengthy
- * discussion threads. You can hide this from sighted users using the class
- * element-invisible.
+ * - $parent: A text string of parent comment submission information created
+ *   from $parent_author and $parent_created during
+ *   template_preprocess_comment(). This information is presented to help
+ *   screen readers follow lengthy discussion threads. You can hide this from
+ *   sighted users using the class element-invisible.
  *
  * These two variables are provided for context:
  * - $comment: Full comment object.