diff --git a/lib/template-tags.php b/lib/template-tags.php
deleted file mode 100644
index 1de1a7a..0000000
--- a/lib/template-tags.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-// Return post entry meta information
-function roots_entry_meta() {
-  echo '<time class="updated" datetime="'. get_the_time('c') .'" pubdate>'. sprintf(__('Posted on %s at %s.', 'roots'), get_the_date(), get_the_time()) .'</time>';
-  echo '<p class="byline author vcard">'. __('Written by', 'roots') .' <a href="'. get_author_posts_url(get_the_author_meta('ID')) .'" rel="author" class="fn">'. get_the_author() .'</a></p>';
-}
diff --git a/templates/content-single.php b/templates/content-single.php
index 52e6b17..eb8c310 100644
--- a/templates/content-single.php
+++ b/templates/content-single.php
@@ -2,7 +2,7 @@
   <article <?php post_class() ?> id="post-<?php the_ID(); ?>">
     <header>
       <h1 class="entry-title"><?php the_title(); ?></h1>
-      <?php roots_entry_meta(); ?>
+      <?php get_template_part('templates/entry-meta'); ?>
     </header>
     <div class="entry-content">
       <?php the_content(); ?>
@@ -13,4 +13,4 @@
     </footer>
     <?php comments_template('/templates/comments.php'); ?>
   </article>
-<?php endwhile; ?>
\ No newline at end of file
+<?php endwhile; ?>
diff --git a/templates/content.php b/templates/content.php
index 00252cd..52c6ca9 100644
--- a/templates/content.php
+++ b/templates/content.php
@@ -10,7 +10,7 @@
   <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
     <header>
       <h2><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></h2>
-      <?php roots_entry_meta(); ?>
+      <?php get_template_part('templates/entry-meta'); ?>
     </header>
     <div class="entry-content">
       <?php the_excerpt(); ?>
diff --git a/templates/entry-meta.php b/templates/entry-meta.php
new file mode 100644
index 0000000..5fc338d
--- /dev/null
+++ b/templates/entry-meta.php
@@ -0,0 +1,2 @@
+<time class="updated" datetime="<?php echo get_the_time('c'); ?>" pubdate><?php echo sprintf(__('Posted on %s at %s.', 'roots'), get_the_date(), get_the_time()); ?></time>
+<p class="byline author vcard"><?php echo __('Written by', 'roots'); ?> <a href="<?php echo get_author_posts_url(get_the_author_meta('ID')); ?>" rel="author" class="fn"><?php echo get_the_author(); ?></a></p>