diff --git a/src/wp-content/themes/twentyfourteen/content-aside.php b/src/wp-content/themes/twentyfourteen/content-aside.php
index 523e15665d..ca17003f24 100644
--- a/src/wp-content/themes/twentyfourteen/content-aside.php
+++ b/src/wp-content/themes/twentyfourteen/content-aside.php
@@ -53,11 +53,8 @@
 		?>
 	</div><!-- .entry-content -->
 
-	<?php if ( has_tag() ) : ?>
-	<footer class="entry-meta">
-		<span class="tag-links">
-			<?php echo get_the_tag_list(); ?>
-		</span>
-	</footer><!-- .entry-meta -->
-	<?php endif; ?>
+	<?php
+		if ( has_tag() )
+			echo get_the_tag_list( '<footer class="entry-meta"><span class="tag-links">', '', '</span></footer>' );
+	?>
 </article><!-- #post-## -->
diff --git a/src/wp-content/themes/twentyfourteen/content-audio.php b/src/wp-content/themes/twentyfourteen/content-audio.php
index 5bec8c0f0f..b18b6e5722 100644
--- a/src/wp-content/themes/twentyfourteen/content-audio.php
+++ b/src/wp-content/themes/twentyfourteen/content-audio.php
@@ -53,11 +53,8 @@
 		?>
 	</div><!-- .entry-content -->
 
-	<?php if ( has_tag() ) : ?>
-	<footer class="entry-meta">
-		<span class="tag-links">
-			<?php echo get_the_tag_list(); ?>
-		</span>
-	</footer><!-- .entry-meta -->
-	<?php endif; ?>
+	<?php
+		if ( has_tag() )
+			echo get_the_tag_list( '<footer class="entry-meta"><span class="tag-links">', '', '</span></footer>' );
+	?>
 </article><!-- #post-## -->
diff --git a/src/wp-content/themes/twentyfourteen/content-gallery.php b/src/wp-content/themes/twentyfourteen/content-gallery.php
index cee0a5250f..fe27a97154 100644
--- a/src/wp-content/themes/twentyfourteen/content-gallery.php
+++ b/src/wp-content/themes/twentyfourteen/content-gallery.php
@@ -53,11 +53,8 @@
 		?>
 	</div><!-- .entry-content -->
 
-	<?php if ( has_tag() ) : ?>
-	<footer class="entry-meta">
-		<span class="tag-links">
-			<?php echo get_the_tag_list(); ?>
-		</span>
-	</footer><!-- .entry-meta -->
-	<?php endif; ?>
+	<?php
+		if ( has_tag() )
+			echo get_the_tag_list( '<footer class="entry-meta"><span class="tag-links">', '', '</span></footer>' );
+	?>
 </article><!-- #post-## -->
diff --git a/src/wp-content/themes/twentyfourteen/content-image.php b/src/wp-content/themes/twentyfourteen/content-image.php
index 88c2b466a2..563ff42824 100644
--- a/src/wp-content/themes/twentyfourteen/content-image.php
+++ b/src/wp-content/themes/twentyfourteen/content-image.php
@@ -53,11 +53,8 @@
 		?>
 	</div><!-- .entry-content -->
 
-	<?php if ( has_tag() ) : ?>
-	<footer class="entry-meta">
-		<span class="tag-links">
-			<?php echo get_the_tag_list(); ?>
-		</span>
-	</footer><!-- .entry-meta -->
-	<?php endif; ?>
+	<?php
+		if ( has_tag() )
+			echo get_the_tag_list( '<footer class="entry-meta"><span class="tag-links">', '', '</span></footer>' );
+	?>
 </article><!-- #post-## -->
diff --git a/src/wp-content/themes/twentyfourteen/content-link.php b/src/wp-content/themes/twentyfourteen/content-link.php
index ad2c3891d4..a49c62ae6a 100644
--- a/src/wp-content/themes/twentyfourteen/content-link.php
+++ b/src/wp-content/themes/twentyfourteen/content-link.php
@@ -53,11 +53,8 @@
 		?>
 	</div><!-- .entry-content -->
 
-	<?php if ( has_tag() ) : ?>
-	<footer class="entry-meta">
-		<span class="tag-links">
-			<?php echo get_the_tag_list(); ?>
-		</span>
-	</footer><!-- .entry-meta -->
-	<?php endif; ?>
+	<?php
+		if ( has_tag() )
+			echo get_the_tag_list( '<footer class="entry-meta"><span class="tag-links">', '', '</span></footer>' );
+	?>
 </article><!-- #post-## -->
diff --git a/src/wp-content/themes/twentyfourteen/content-quote.php b/src/wp-content/themes/twentyfourteen/content-quote.php
index 6b9c059c9b..e43c598f78 100644
--- a/src/wp-content/themes/twentyfourteen/content-quote.php
+++ b/src/wp-content/themes/twentyfourteen/content-quote.php
@@ -53,11 +53,8 @@
 		?>
 	</div><!-- .entry-content -->
 
-	<?php if ( has_tag() ) : ?>
-	<footer class="entry-meta">
-		<span class="tag-links">
-			<?php echo get_the_tag_list(); ?>
-		</span>
-	</footer><!-- .entry-meta -->
-	<?php endif; ?>
+	<?php
+		if ( has_tag() )
+			echo get_the_tag_list( '<footer class="entry-meta"><span class="tag-links">', '', '</span></footer>' );
+	?>
 </article><!-- #post-## -->
diff --git a/src/wp-content/themes/twentyfourteen/content-video.php b/src/wp-content/themes/twentyfourteen/content-video.php
index a6049b195c..c525e0d767 100644
--- a/src/wp-content/themes/twentyfourteen/content-video.php
+++ b/src/wp-content/themes/twentyfourteen/content-video.php
@@ -53,11 +53,8 @@
 		?>
 	</div><!-- .entry-content -->
 
-	<?php if ( has_tag() ) : ?>
-	<footer class="entry-meta">
-		<span class="tag-links">
-			<?php echo get_the_tag_list(); ?>
-		</span>
-	</footer><!-- .entry-meta -->
-	<?php endif; ?>
+	<?php
+		if ( has_tag() )
+			echo get_the_tag_list( '<footer class="entry-meta"><span class="tag-links">', '', '</span></footer>' );
+	?>
 </article><!-- #post-## -->
diff --git a/src/wp-content/themes/twentyfourteen/content.php b/src/wp-content/themes/twentyfourteen/content.php
index 2d427f3672..3108b86b4a 100644
--- a/src/wp-content/themes/twentyfourteen/content.php
+++ b/src/wp-content/themes/twentyfourteen/content.php
@@ -62,11 +62,8 @@
 	</div><!-- .entry-content -->
 	<?php endif; ?>
 
-	<?php if ( has_tag() ) : ?>
-	<footer class="entry-meta">
-		<span class="tag-links">
-			<?php echo get_the_tag_list(); ?>
-		</span>
-	</footer><!-- .entry-meta -->
-	<?php endif; ?>
+	<?php
+		if ( has_tag() )
+			echo get_the_tag_list( '<footer class="entry-meta"><span class="tag-links">', '', '</span></footer>' );
+	?>
 </article><!-- #post-## -->
diff --git a/src/wp-content/themes/twentyfourteen/style.css b/src/wp-content/themes/twentyfourteen/style.css
index 710e0fc011..431b6ff3ab 100644
--- a/src/wp-content/themes/twentyfourteen/style.css
+++ b/src/wp-content/themes/twentyfourteen/style.css
@@ -1138,11 +1138,6 @@ a.post-thumbnail:hover {
 	padding: 0 10px;
 }
 
-.site-content footer.entry-meta:empty {
-	margin: 0;
-}
-
-
 /* Tag links style */
 
 .tag-links a {