diff --git a/src/wp-content/themes/twentyfifteen/404.php b/src/wp-content/themes/twentyfifteen/404.php
index e5ca57380b..0e4cdc4775 100644
--- a/src/wp-content/themes/twentyfifteen/404.php
+++ b/src/wp-content/themes/twentyfifteen/404.php
@@ -14,11 +14,11 @@ get_header(); ?>
 
 			<section class="error-404 not-found">
 				<header class="page-header">
-					<h1 class="page-title"><?php _e( 'Oops! That page can&rsquo;t be found.', 'twentyfifteen' ); ?></h1>
+					<h1 class="page-title"><?php esc_html_e( 'Oops! That page can&rsquo;t be found.', 'twentyfifteen' ); ?></h1>
 				</header><!-- .page-header -->
 
 				<div class="page-content">
-					<p><?php _e( 'It looks like nothing was found at this location. Maybe try a search?', 'twentyfifteen' ); ?></p>
+					<p><?php esc_html_e( 'It looks like nothing was found at this location. Maybe try a search?', 'twentyfifteen' ); ?></p>
 
 					<?php get_search_form(); ?>
 				</div><!-- .page-content -->
diff --git a/src/wp-content/themes/twentyfifteen/author-bio.php b/src/wp-content/themes/twentyfifteen/author-bio.php
index 995ad1a4c7..19a7351805 100644
--- a/src/wp-content/themes/twentyfifteen/author-bio.php
+++ b/src/wp-content/themes/twentyfifteen/author-bio.php
@@ -9,7 +9,7 @@
 ?>
 
 <div class="author-info">
-	<h2 class="author-heading"><?php _e( 'Published by', 'twentyfifteen' ); ?></h2>
+	<h2 class="author-heading"><?php esc_html_e( 'Published by', 'twentyfifteen' ); ?></h2>
 	<div class="author-avatar">
 		<?php
 		/**
diff --git a/src/wp-content/themes/twentyfifteen/content-none.php b/src/wp-content/themes/twentyfifteen/content-none.php
index 055e50b24b..183980bf69 100644
--- a/src/wp-content/themes/twentyfifteen/content-none.php
+++ b/src/wp-content/themes/twentyfifteen/content-none.php
@@ -12,7 +12,7 @@
 
 <section class="no-results not-found">
 	<header class="page-header">
-		<h1 class="page-title"><?php _e( 'Nothing Found', 'twentyfifteen' ); ?></h1>
+		<h1 class="page-title"><?php esc_html_e( 'Nothing Found', 'twentyfifteen' ); ?></h1>
 	</header><!-- .page-header -->
 
 	<div class="page-content">
@@ -28,12 +28,12 @@
 
 		<?php elseif ( is_search() ) : ?>
 
-			<p><?php _e( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'twentyfifteen' ); ?></p>
+			<p><?php esc_html_e( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'twentyfifteen' ); ?></p>
 			<?php get_search_form(); ?>
 
 		<?php else : ?>
 
-			<p><?php _e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', 'twentyfifteen' ); ?></p>
+			<p><?php esc_html_e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', 'twentyfifteen' ); ?></p>
 			<?php get_search_form(); ?>
 
 		<?php endif; ?>
diff --git a/src/wp-content/themes/twentyfifteen/functions.php b/src/wp-content/themes/twentyfifteen/functions.php
index 0528a01be9..69ebd0f169 100644
--- a/src/wp-content/themes/twentyfifteen/functions.php
+++ b/src/wp-content/themes/twentyfifteen/functions.php
@@ -326,7 +326,7 @@ if ( ! function_exists( 'twentyfifteen_setup' ) ) :
 		// Indicate widget sidebars can use selective refresh in the Customizer.
 		add_theme_support( 'customize-selective-refresh-widgets' );
 	}
-endif; // twentyfifteen_setup()
+endif;
 add_action( 'after_setup_theme', 'twentyfifteen_setup' );
 
 /**
diff --git a/src/wp-content/themes/twentyfifteen/header.php b/src/wp-content/themes/twentyfifteen/header.php
index d75fc0c876..9e18ec4ac9 100644
--- a/src/wp-content/themes/twentyfifteen/header.php
+++ b/src/wp-content/themes/twentyfifteen/header.php
@@ -27,7 +27,7 @@
 	<a class="skip-link screen-reader-text" href="#content">
 		<?php
 		/* translators: Hidden accessibility text. */
-		_e( 'Skip to content', 'twentyfifteen' );
+		esc_html_e( 'Skip to content', 'twentyfifteen' );
 		?>
 	</a>
 
@@ -52,7 +52,7 @@
 						<?php
 					endif;
 					?>
-				<button class="secondary-toggle"><?php _e( 'Menu and widgets', 'twentyfifteen' ); ?></button>
+				<button class="secondary-toggle"><?php esc_html_e( 'Menu and widgets', 'twentyfifteen' ); ?></button>
 			</div><!-- .site-branding -->
 		</header><!-- .site-header -->
 
diff --git a/src/wp-content/themes/twentyfifteen/inc/custom-header.php b/src/wp-content/themes/twentyfifteen/inc/custom-header.php
index a09bb6b445..675be71efb 100644
--- a/src/wp-content/themes/twentyfifteen/inc/custom-header.php
+++ b/src/wp-content/themes/twentyfifteen/inc/custom-header.php
@@ -193,7 +193,7 @@ if ( ! function_exists( 'twentyfifteen_header_style' ) ) :
 	</style>
 		<?php
 	}
-endif; // twentyfifteen_header_style()
+endif;
 
 /**
  * Enqueues front-end CSS for the header background color.