diff --git a/404.php b/404.php
index f31cfc06..d41bd330 100644
--- a/404.php
+++ b/404.php
@@ -25,7 +25,8 @@ get_header(); ?>
 
 						the_widget( 'WP_Widget_Recent_Posts' );
 
-						if ( _s_categorized_blog() ) : // Only show the widget if site has multiple categories.
+						// Only show the widget if site has multiple categories.
+						if ( _s_categorized_blog() ) :
 					?>
 
 					<div class="widget widget_categories">
diff --git a/functions.php b/functions.php
index 16678312..83a2348b 100644
--- a/functions.php
+++ b/functions.php
@@ -77,7 +77,7 @@ function _s_setup() {
 		'default-image' => '',
 	) ) );
 }
-endif; // _s_setup
+endif;
 add_action( 'after_setup_theme', '_s_setup' );
 
 /**
diff --git a/inc/custom-header.php b/inc/custom-header.php
index 83288075..cfa68f8d 100644
--- a/inc/custom-header.php
+++ b/inc/custom-header.php
@@ -34,15 +34,17 @@ add_action( 'after_setup_theme', '_s_custom_header_setup' );
 
 if ( ! function_exists( '_s_header_style' ) ) :
 /**
- * Styles the header image and text displayed on the blog
+ * Styles the header image and text displayed on the blog.
  *
  * @see _s_custom_header_setup().
  */
 function _s_header_style() {
 	$header_text_color = get_header_textcolor();
 
-	// If no custom options for text are set, let's bail
-	// get_header_textcolor() options: HEADER_TEXTCOLOR is default, hide text (returns 'blank') or any hex value.
+	/*
+	 * If no custom options for text are set, let's bail.
+	 * get_header_textcolor() options: Any hex value, 'blank' to hide text. Default: HEADER_TEXTCOLOR.
+	 */
 	if ( HEADER_TEXTCOLOR === $header_text_color ) {
 		return;
 	}
@@ -71,4 +73,4 @@ function _s_header_style() {
 	</style>
 	<?php
 }
-endif; // _s_header_style
+endif;
diff --git a/inc/jetpack.php b/inc/jetpack.php
index 030b4daf..86f006e6 100644
--- a/inc/jetpack.php
+++ b/inc/jetpack.php
@@ -23,7 +23,7 @@ function _s_jetpack_setup() {
 
 	// Add theme support for Responsive Videos.
 	add_theme_support( 'jetpack-responsive-videos' );
-} // end function _s_jetpack_setup
+}
 add_action( 'after_setup_theme', '_s_jetpack_setup' );
 
 /**
@@ -38,4 +38,4 @@ function _s_infinite_scroll_render() {
 		    get_template_part( 'template-parts/content', get_post_format() );
 		endif;
 	}
-} // end function _s_infinite_scroll_render
+}