diff --git a/comments.php b/comments.php
index 4d202517..e29109fa 100644
--- a/comments.php
+++ b/comments.php
@@ -25,11 +25,13 @@ if ( post_password_required() ) {
 	<?php if ( have_comments() ) : ?>
 		<h2 class="comments-title">
 			<?php
-			printf( _nx( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;',
-				get_comments_number(), 'comments title', 'understrap' ),
-				number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>' );
+				printf( // WPCS: XSS OK.
+					esc_html( _nx( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'comments title', '_s' ) ),
+					number_format_i18n( get_comments_number() ),
+					'<span>' . get_the_title() . '</span>'
+				);
 			?>
-		</h2>
+		</h2><!-- .comments-title -->
 
 		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through. ?>
 			<nav class="comment-navigation" id="comment-nav-above">
diff --git a/inc/theme-settings.php b/inc/theme-settings.php
index 5867f1f0..7665a578 100644
--- a/inc/theme-settings.php
+++ b/inc/theme-settings.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * Check and setup theme's default settings
+ *
+ * @package understrap
  */
 function setup_theme_default_settings() {