diff --git a/lib/comments.php b/lib/comments.php
index e8c5ba5..c5c8d11 100644
--- a/lib/comments.php
+++ b/lib/comments.php
@@ -28,21 +28,8 @@ class Roots_Walker_Comment extends Walker_Comment {
 
     extract($args, EXTR_SKIP); ?>
 
-  <li id="comment-<?php comment_ID(); ?>" <?php comment_class('media comment-' . get_comment_ID()); ?>>
-    <?php echo get_avatar($comment, $size = '64'); ?>
-    <div class="media-body">
-      <h4 class="media-heading"><?php echo get_comment_author_link(); ?></h4>
-      <time datetime="<?php echo comment_date('c'); ?>"><a href="<?php echo htmlspecialchars(get_comment_link($comment->comment_ID)); ?>"><?php printf(__('%1$s', 'roots'), get_comment_date(),  get_comment_time()); ?></a></time>
-      <?php edit_comment_link(__('(Edit)', 'roots'), '', ''); ?>
-
-      <?php if ($comment->comment_approved == '0') : ?>
-        <div class="alert">
-          <?php _e('Your comment is awaiting moderation.', 'roots'); ?>
-        </div>
-      <?php endif; ?>
-
-      <?php comment_text(); ?>
-      <?php comment_reply_link(array_merge($args, array('depth' => $depth, 'max_depth' => $args['max_depth']))); ?>
+  <li <?php comment_class('media comment-' . get_comment_ID()); ?>>
+    <?php include(locate_template('templates/comment.php')); ?>
   <?php
   }
 
diff --git a/templates/comment.php b/templates/comment.php
new file mode 100644
index 0000000..fd1e40b
--- /dev/null
+++ b/templates/comment.php
@@ -0,0 +1,14 @@
+<?php echo get_avatar($comment, $size = '64'); ?>
+<div class="media-body">
+  <h4 class="media-heading"><?php echo get_comment_author_link(); ?></h4>
+  <time datetime="<?php echo comment_date('c'); ?>"><a href="<?php echo htmlspecialchars(get_comment_link($comment->comment_ID)); ?>"><?php printf(__('%1$s', 'roots'), get_comment_date(),  get_comment_time()); ?></a></time>
+  <?php edit_comment_link(__('(Edit)', 'roots'), '', ''); ?>
+
+  <?php if ($comment->comment_approved == '0') : ?>
+    <div class="alert">
+      <?php _e('Your comment is awaiting moderation.', 'roots'); ?>
+    </div>
+  <?php endif; ?>
+
+  <?php comment_text(); ?>
+  <?php comment_reply_link(array_merge($args, array('depth' => $depth, 'max_depth' => $args['max_depth']))); ?>