diff --git a/404.php b/404.php
index b888b41..0323162 100644
--- a/404.php
+++ b/404.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 /**
  * The template for displaying 404 pages (not found)
  *
@@ -26,8 +26,8 @@ $sophia_after_dark_pnf_latest_posts = get_theme_mod( 'sophia_after_dark_enable_p
 
 			<div class="page-content">
 				<p><?php esc_html_e( 'It looks like nothing was found at this location.', 'sophia-after-dark' ); ?></p>
-			</div><!-- .page-content -->
-		</section><!-- .error-404 -->
+			</div>
+		</section>
 
 		<?php if ( true === $sophia_after_dark_pnf_latest_posts ) : ?>
 			<div class="page-extra-content mt-404-latest-posts-wrapper">
@@ -55,11 +55,11 @@ $sophia_after_dark_pnf_latest_posts = get_theme_mod( 'sophia_after_dark_enable_p
 
 				wp_reset_postdata();
 				?>
-			</div><!-- .mt-404-latest-posts-wrapper -->
+			</div>
 		<?php endif; ?>
 
-	</main><!-- #main -->
-</div><!-- #primary -->
+	</main>
+</div>
 
 <?php
 get_footer();
diff --git a/archive.php b/archive.php
index 47e54ec..ff99ba0 100644
--- a/archive.php
+++ b/archive.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 /**
  * The template for displaying archive pages
  *
@@ -38,8 +38,8 @@ get_header();
 				?>
 
 				<?php if ( 'mt-archive--masonry-style' === $archive_style ) : ?>
-						</div><!-- #mt-masonry -->
-					</div><!-- .sophia-after-dark-content-masonry -->
+						</div>
+					</div>
 				<?php endif; ?>
 
 				<?php
@@ -58,13 +58,13 @@ get_header();
 			<?php endif; ?>
 
 			<?php if ( 'mt-archive--block-grid-style' === $archive_style ) : ?>
-				</div><!-- .archive-grid-post-wrapper -->
+				</div>
 			<?php endif; ?>
 
-		</main><!-- #main -->
-	</div><!-- #primary -->
+		</main>
+	</div>
 
 	<?php get_sidebar(); ?>
-</div><!-- .mt-page-content-wrapper -->
+</div>
 
 <?php get_footer(); ?>
diff --git a/index.php b/index.php
index cd0012f..f5832d8 100644
--- a/index.php
+++ b/index.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 /**
  * The main template file
  *
@@ -44,8 +44,8 @@ $archive_style = get_theme_mod('sophia_after_dark_archive_style', 'mt-archive--m
 				?>
 
 				<?php if ('mt-archive--masonry-style' === $archive_style): ?>
-						</div> <!-- #mt-masonry -->
-					</div> <!-- .sophia-after-dark-content-masonry -->
+						</div> 
+					</div> 
 				<?php endif; ?>
 
 				<?php the_posts_pagination(); ?>
@@ -55,7 +55,7 @@ $archive_style = get_theme_mod('sophia_after_dark_archive_style', 'mt-archive--m
 			<?php endif; ?>
 
 			<?php if ('mt-archive--block-grid-style' === $archive_style): ?>
-				</div> <!-- .archive-grid-post-wrapper -->
+				</div> 
 			<?php endif; ?>
 
 		</main>
diff --git a/page.php b/page.php
index 0f8b4cc..31c0a0c 100644
--- a/page.php
+++ b/page.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 /**
  * The template for displaying all pages
  *
@@ -31,11 +31,11 @@ get_header();
 			endwhile;
 			?>
 
-		</main><!-- #main -->
-	</div><!-- #primary -->
+		</main>
+	</div>
 
 	<?php get_sidebar(); ?>
-</div><!-- .mt-page-content-wrapper -->
+</div>
 
 <?php
 get_footer();
diff --git a/search.php b/search.php
index d5f3750..0e0299f 100644
--- a/search.php
+++ b/search.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 /**
  * The template for displaying search results pages
  *
@@ -35,8 +35,8 @@ get_header();
 
 				if ( 'mt-archive--masonry-style' === $archive_style ) :
 			?>
-						</div><!-- #mt-masonry -->
-					</div><!-- .sophia-after-dark-content-masonry -->
+						</div>
+					</div>
 			<?php
 				endif;
 
@@ -48,15 +48,15 @@ get_header();
 			endif;
 
 			if ( 'mt-archive--block-grid-style' === $archive_style ) {
-				echo '</div><!-- .archive-grid-post-wrapper -->';
+				echo '</div>';
 			}
 			?>
 
-		</main><!-- #main -->
-	</section><!-- #primary -->
+		</main>
+	</section>
 
 	<?php get_sidebar(); ?>
-</div><!-- .mt-page-content-wrapper -->
+</div>
 
 <?php
 get_footer();
diff --git a/single.php b/single.php
index de80fd0..c91d25b 100644
--- a/single.php
+++ b/single.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 /**
  * The template for displaying all single posts
  *
@@ -34,11 +34,11 @@ get_header();
 			}
 			?>
 
-		</main><!-- #main -->
-	</div><!-- #primary -->
+		</main>
+	</div>
 
 	<?php get_sidebar(); ?>
-</div><!-- .mt-page-content-wrapper -->
+</div>
 
 <?php
 get_footer();