diff --git a/index.php b/index.php
index 7d33b88..6fb01ee 100644
--- a/index.php
+++ b/index.php
@@ -1,5 +1,21 @@
 <?php get_template_part('templates/page', 'header'); ?>
-<?php
-  $format = have_posts() ? get_post_format() : false;
-  get_template_part('templates/content', $format);
-?>
\ No newline at end of file
+
+<?php if (!have_posts()) : ?>
+  <div class="alert">
+    <?php _e('Sorry, no results were found.', 'roots'); ?>
+  </div>
+  <?php get_search_form(); ?>
+<?php endif; ?>
+
+<?php while (have_posts()) : the_post(); ?>
+  <?php get_template_part('templates/content', get_post_format()); ?>
+<?php endwhile; ?>
+
+<?php if ($wp_query->max_num_pages > 1) : ?>
+  <nav class="post-nav">
+    <ul class="pager">
+      <li class="previous"><?php next_posts_link(__('&larr; Older posts', 'roots')); ?></li>
+      <li class="next"><?php previous_posts_link(__('Newer posts &rarr;', 'roots')); ?></li>
+    </ul>
+  </nav>
+<?php endif; ?>
diff --git a/templates/content.php b/templates/content.php
index f80a4c0..8476cb3 100644
--- a/templates/content.php
+++ b/templates/content.php
@@ -1,34 +1,12 @@
-<?php if (!have_posts()) : ?>
-  <div class="alert">
-    <?php _e('Sorry, no results were found.', 'roots'); ?>
+<article <?php post_class(); ?>>
+  <header>
+    <h2 class="entry-title"><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></h2>
+    <?php get_template_part('templates/entry-meta'); ?>
+  </header>
+  <div class="entry-summary">
+    <?php the_excerpt(); ?>
   </div>
-  <?php get_search_form(); ?>
-<?php endif; ?>
-
-<?php while (have_posts()) : the_post(); ?>
-  <article <?php post_class(); ?>>
-    <header>
-      <h2 class="entry-title"><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></h2>
-      <?php get_template_part('templates/entry-meta'); ?>
-    </header>
-    <div class="entry-summary">
-      <?php the_excerpt(); ?>
-    </div>
-    <footer>
-      <?php the_tags('<ul class="entry-tags"><li>','</li><li>','</li></ul>'); ?>
-    </footer>
-  </article>
-<?php endwhile; ?>
-
-<?php if ($wp_query->max_num_pages > 1) : ?>
-  <nav class="post-nav">
-    <ul class="pager">
-      <?php if (get_next_posts_link()) : ?>
-        <li class="previous"><?php next_posts_link(__('&larr; Older posts', 'roots')); ?></li>
-      <?php endif; ?>
-      <?php if (get_previous_posts_link()) : ?>
-        <li class="next"><?php previous_posts_link(__('Newer posts &rarr;', 'roots')); ?></li>
-      <?php endif; ?>
-    </ul>
-  </nav>
-<?php endif; ?>
+  <footer>
+    <?php the_tags('<ul class="entry-tags"><li>','</li><li>','</li></ul>'); ?>
+  </footer>
+</article>