diff --git a/404.php b/404.php
index eebc7d1..e80e587 100644
--- a/404.php
+++ b/404.php
@@ -19,10 +19,10 @@ $sophia_after_dark_pnf_latest_posts = get_theme_mod( 'sophia_after_dark_enable_p
 				<div class="error-num"><span><?php esc_html_e( 'Error', 'sophia-after-dark' );?>&nbsp;</span><?php esc_html_e( '404', 'sophia-after-dark' ); ?></div>
 				<header class="page-header">
 					<h1 class="page-title"><?php esc_html_e( 'Oops! That page can&rsquo;t be found.', 'sophia-after-dark' ); ?></h1>
-				</header><!-- .page-header -->
+				</header>
 				<div class="page-content">
 					<p><?php esc_html_e( 'It looks like nothing was found at this location.', 'sophia-after-dark' ); ?></p>
-			</section><!-- .error-404 -->
+			</section>
 
 			<?php if ( true ===  $sophia_after_dark_pnf_latest_posts ) { ?>
 			<div class="page-extra-content mt-404-latest-posts-wrapper">
@@ -49,16 +49,16 @@ $sophia_after_dark_pnf_latest_posts = get_theme_mod( 'sophia_after_dark_enable_p
 							get_template_part( 'template-parts/content', 'related' );
 							
 						}
-						echo '</div><!-- .mt-pnf-latest-posts-wrapper -->';
+						echo '</div>';
 					}
 					wp_reset_postdata();
 				?>
-			</div><!-- .page-extra-content -->
+			</div>
 
 		<?php } ?>
 
-		</main><!-- #main -->
-	</div><!-- #primary -->
+		</main>
+	</div>
 
 <?php
 get_footer();
\ No newline at end of file
diff --git a/archive.php b/archive.php
index ccbca9f..1db9b43 100644
--- a/archive.php
+++ b/archive.php
@@ -39,8 +39,8 @@ get_header();
 
 				if ( 'mt-archive--masonry-style' === $archive_style ) {
 			?>
-						</div><!-- #mt-masonry -->
-					</div><!-- .sophia-after-dark-content-masonry -->
+						</div>
+					</div>
 			<?php
 				}
 
@@ -51,13 +51,13 @@ get_header();
 			endif;
 
 			if ( 'mt-archive--block-grid-style' === $archive_style ) {
-				echo '</div><!-- .archive-grid-post-wrapper -->';
+				echo '</div>';
 			}
 		?>
-		</main><!-- #main -->
-	</div><!-- #primary -->
+		</main>
+	</div>
 
 	<?php get_sidebar(); ?>
-</div><!-- .mt-page-content-wrapper -->
+</div>
 <?php
 get_footer();
\ No newline at end of file
diff --git a/comments.php b/comments.php
index 7b4ce64..f58d4ec 100644
--- a/comments.php
+++ b/comments.php
@@ -44,7 +44,7 @@ if ( post_password_required() ) {
 				);
 			}
 			?>
-		</h2><!-- .comments-title -->
+		</h2>
 
 		<?php the_comments_navigation(); ?>
 
@@ -55,7 +55,7 @@ if ( post_password_required() ) {
 				'short_ping' => true,
 			) );
 			?>
-		</ol><!-- .comment-list -->
+		</ol>
 
 		<?php
 		the_comments_navigation();
@@ -72,4 +72,4 @@ if ( post_password_required() ) {
 	comment_form();
 	?>
 
-</div><!-- #comments -->
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/footer.php b/footer.php
index acb4c98..46ef1c8 100644
--- a/footer.php
+++ b/footer.php
@@ -11,8 +11,8 @@
  */
 
 ?>
-	    </div> <!-- mt-container -->
-	</div><!-- #content -->
+	    </div> 
+	</div>
 
     <?php
         /**
@@ -45,7 +45,7 @@
 		do_action( 'sophia_after_dark_scroll_top' );
 	?>
 	
-</div><!-- #page -->
+</div>
 
 <?php
 	/**
diff --git a/inc/customizer/mt-customizer-custom-classes.php b/inc/customizer/mt-customizer-custom-classes.php
index a76e336..3e2333a 100644
--- a/inc/customizer/mt-customizer-custom-classes.php
+++ b/inc/customizer/mt-customizer-custom-classes.php
@@ -352,8 +352,8 @@ if ( ! function_exists( 'sophia_after_dark_register_custom_controls' ) ) :
 								<a class="mt-repeater-field-remove" href="#remove"><?php esc_html_e( 'Delete', 'sophia-after-dark' ) ?></a> |
 								<a class="mt-repeater-field-close" href="#close"><?php esc_html_e( 'Close', 'sophia-after-dark' ) ?></a>
 								</div>
-							</div><!-- .mt-repeater-footer -->
-						</div><!-- .mt-repeater-fields-->
+							</div>
+						</div>
 						</li>
 				<?php   
 						}
diff --git a/inc/hooks/mt-custom-hooks.php b/inc/hooks/mt-custom-hooks.php
index 381b261..8b10a3c 100644
--- a/inc/hooks/mt-custom-hooks.php
+++ b/inc/hooks/mt-custom-hooks.php
@@ -42,7 +42,7 @@ if ( ! function_exists( 'sophia_after_dark_site_branding' ) ) :
 					?>
 							<p class="site-description"><?php echo $sophia_after_dark_description; /* WPCS: xss ok. */ ?></p>
 					<?php endif; ?>
-				</div><!-- .site-branding -->
+				</div>
 				<div class="header-widget-wrapper">
 					<?php 
 						if ( is_active_sidebar( 'header-ads-section' ) ) {
@@ -50,8 +50,8 @@ if ( ! function_exists( 'sophia_after_dark_site_branding' ) ) :
 						}
 					?>
 				</div>
-			</div> <!-- mt-container -->
-		</div><!-- .logo-ads-wrap -->
+			</div> 
+		</div>
 <?php
 	}
 	
@@ -86,7 +86,7 @@ if ( ! function_exists( 'sophia_after_dark_header_main_menu' ) ) :
 						'menu_id'        => 'primary-menu',
 					) );
 				?>
-			</nav><!-- #site-navigation -->
+			</nav>
 		</div>
 <?php
 	}
@@ -144,8 +144,8 @@ if ( ! function_exists( 'sophia_after_dark_menu_search_icon' ) ) :
 				<?php get_search_form(); ?>
 
 				<div class="mt-form-close"><a href="javascript:void(0)"><i class="fa fa-close"></i></a></div>
-			</div><!-- .mt-form-wrap -->
-		</div><!-- .mt-menu-search -->
+			</div>
+		</div>
 <?php
 	}
 
@@ -157,7 +157,7 @@ if ( ! function_exists( 'sophia_after_dark_menu_icon_wrapper_end' ) ) :
 	 * function to end icon wrapper
 	 */
 	function sophia_after_dark_menu_icon_wrapper_end() {
-		echo '</div><!-- .mt-social-search-wrapper -->';
+		echo '</div>';
 	}
 
 endif;
@@ -168,8 +168,8 @@ if ( ! function_exists( 'sophia_after_dark_menu_wrapper_end' ) ) :
 	 * function to end menu wrapper
 	 */
 	function sophia_after_dark_menu_wrapper_end() {
-		echo '</div><!--.mt-container -->';
-		echo '</div><!--.mt-social-menu-wrapper -->';
+		echo '</div>';
+		echo '</div>';
 	}
 
 endif;
@@ -180,8 +180,8 @@ if ( ! function_exists( 'sophia_after_dark_main_header_end' ) ) :
 	 * function to end header section
 	 */
 	function sophia_after_dark_main_header_end() {
-		echo '</div><!--.mt-logo-row-wrapper -->';
-		echo '</header><!-- #masthead -->';
+		echo '</div>';
+		echo '</header>';
 	}
 
 endif;
@@ -232,8 +232,8 @@ if ( ! function_exists( 'sophia_after_dark_header_categories_lists_content' ) )
 							}
 						}
 					?>
-				</ul><!-- .mt-slide-cat-lists -->
-			</div><!-- .mt-header-cat-list-wrapper -->
+				</ul>
+			</div>
 <?php
 	}
 
@@ -254,8 +254,8 @@ if ( ! function_exists( 'sophia_after_dark_header_author_box_content' ) ) :
             <div class="author-description"><?php echo wp_kses_post( wpautop( get_the_author_meta( 'description', $sophia_after_dark_user_id ) ) ); ?></div>
             <div class="author-social">
                 <?php sophia_after_dark_social_media_content(); ?>
-            </div><!-- .author-social -->
-        </div><!-- .author-bio-wrap -->
+            </div>
+        </div>
 <?php
 	}
 
@@ -362,8 +362,8 @@ if ( ! function_exists( 'sophia_after_dark_innerpage_header_end' ) ) :
 	 */
 	function sophia_after_dark_innerpage_header_end() {
 ?>
-			</div><!-- .mt-container -->
-		</div><!-- .custom-header -->
+			</div>
+		</div>
 <?php
 	}
 
@@ -434,20 +434,20 @@ if ( ! function_exists( 'sophia_after_dark_front_slider' ) ) :
 												?> 
 											</div>
 											<?php the_title( '<h3 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h3>' ); ?>
-										</div><!--.post-info-wrap -->
-									</div><!-- .slider-post-wrap -->
+										</div>
+									</div>
 							<?php
 								endwhile;
 							endif;
 						?>
-						</div><!-- .front-slider -->
-					</div> <!-- .front-slider-block -->
+						</div>
+					</div> 
 			<?php
 					if ( true == $sophia_after_dark_section_top_featured_posts_option ) {
 						$sophia_after_dark_top_featured_posts_title = get_theme_mod( 'sophia_after_dark_top_featured_posts_title', __( 'Featured News', 'sophia-after-dark' ) );
 						echo '<div class="top-featured-post-main-wrapper">';
 							if ( ! empty( $sophia_after_dark_top_featured_posts_title ) ) {
-								echo '<div class="features-post-title">'.esc_html( $sophia_after_dark_top_featured_posts_title ).'</div><!-- .features-post-title -->';
+								echo '<div class="features-post-title">'.esc_html( $sophia_after_dark_top_featured_posts_title ).'</div>';
 							}
 								
 								$sophia_after_dark_top_featured_post_order = get_theme_mod( 'sophia_after_dark_top_featured_post_order', 'default' );
@@ -480,19 +480,19 @@ if ( ! function_exists( 'sophia_after_dark_front_slider' ) ) :
 													</div>	
 													<header class="entry-header">
 														<?php the_title( '<h3 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h3>' ); ?>
-													</header><!-- .entry-header -->
+													</header>
 												</div>
-											</div><!-- #post-<?php the_ID(); ?> -->
+											</div>
 							<?php
 										$featured_post_count ++;
 									endwhile;
-								echo '</div><!-- .top-featured-post-wrap -->';
+								echo '</div>';
 								endif;
-						echo '</div><!-- .top-featured-post-main-wrapper -->';
+						echo '</div>';
 					}
 				?>
 				</div>
-			</div><!-- .front-slider-wrapper -->
+			</div>
 <?php
 	}
 
@@ -547,7 +547,7 @@ if ( ! function_exists( 'sophia_after_dark_bottom_footer' ) ) :
     								'depth'			 => 1
     							) );
     						?>
-        				</nav><!-- #footer-navigation -->
+        				</nav>
         		<?php
         			}
         		?>
@@ -566,9 +566,9 @@ if ( ! function_exists( 'sophia_after_dark_bottom_footer' ) ) :
         					echo esc_html( $sophia_after_dark_footer_disclaimer );
         				?>
         			</span>
-        		</div><!-- .site-info -->
-            </div><!-- .mt-container -->
-        </div><!-- #bottom-footer -->
+        		</div>
+            </div>
+        </div>
 <?php
 	}
 
@@ -580,7 +580,7 @@ if ( ! function_exists( 'sophia_after_dark_footer_end' ) ) :
 	 * function to end footer wrapper
 	 */
 	function sophia_after_dark_footer_end() {
-		echo '</footer><!-- #colophon -->';
+		echo '</footer>';
 	}
 
 endif;
diff --git a/inc/hooks/mt-top-header-hooks.php b/inc/hooks/mt-top-header-hooks.php
index 135a613..5013756 100644
--- a/inc/hooks/mt-top-header-hooks.php
+++ b/inc/hooks/mt-top-header-hooks.php
@@ -24,8 +24,8 @@ if ( ! function_exists( 'sophia_after_dark_top_header_end' ) ) :
 	 * function to end top header section
 	 */
 	function sophia_after_dark_top_header_end() {
-		echo '</div><!-- mt-container -->';
-		echo '</div><!-- #top-header -->';
+		echo '</div>';
+		echo '</div>';
 	}
 
 endif;
@@ -68,8 +68,8 @@ if ( ! function_exists( 'sophia_after_dark_trending_section' ) ) :
 								echo '</span>';
 							}
                     ?>
-                </div><!-- .tags-wrapper -->
-        </div><!-- .trending-wrapper -->
+                </div>
+        </div>
 <?php
     }
 
@@ -103,8 +103,8 @@ if ( ! function_exists( 'sophia_after_dark_top_header_nav' ) ) :
 						'fallback_cb'	 => false,
 					) );
 				?>
-			</nav><!-- #site-navigation -->
-		</div><!-- .top-header-nav -->
+			</nav>
+		</div>
 	<?php
 	}
 
diff --git a/inc/metaboxes/mt-post-sidebar-meta.php b/inc/metaboxes/mt-post-sidebar-meta.php
index 4e2200b..a0d7b86 100644
--- a/inc/metaboxes/mt-post-sidebar-meta.php
+++ b/inc/metaboxes/mt-post-sidebar-meta.php
@@ -87,8 +87,8 @@ function sophia_after_dark_sidebar_callback( $post ) {
                             <img src="<?php echo esc_url( $field['thumbnail'] ); ?>" title="<?php echo esc_attr( $field['label'] ); ?>" alt="<?php echo esc_attr( $field['label'] ); ?>" />
                         </label>
                 <?php } ?>
-            </div><!-- .buttonset -->
-        </div><!-- .mt-meta-options-wrap  -->
+            </div>
+        </div>
     <?php
 }
 
diff --git a/inc/template-functions.php b/inc/template-functions.php
index f238e8f..27356a7 100644
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -189,8 +189,8 @@ if ( ! function_exists( 'sophia_after_dark_preloader' ) ) :
         <div id="preloader-background">
             <div class="preloader-wrapper">
                 <div class="sk-spinner sk-spinner-pulse"></div>
-            </div><!-- .preloader-wrapper -->
-        </div><!-- #preloader-background -->
+            </div>
+        </div>
 <?php
     }
 
diff --git a/inc/template-tags.php b/inc/template-tags.php
index 69faaf7..c6bb427 100644
--- a/inc/template-tags.php
+++ b/inc/template-tags.php
@@ -200,7 +200,7 @@ if ( ! function_exists( 'sophia_after_dark_post_thumbnail' ) ) :
 
 			<div class="post-thumbnail">
 				<?php the_post_thumbnail( 'sophia-after-dark-full-width' ); ?>
-			</div><!-- .post-thumbnail -->
+			</div>
 
 		<?php else : ?>
 
@@ -244,7 +244,7 @@ if ( ! function_exists( 'sophia_after_dark_article_categories_list' ) ) :
 				<?php
 					}
 				?>
-			</div><!-- .post-cats-list --><?php
+			</div><?php
 		}
 	}
 
diff --git a/inc/theme-settings/mt-theme-settings.php b/inc/theme-settings/mt-theme-settings.php
index 08c5f32..17f5b8f 100644
--- a/inc/theme-settings/mt-theme-settings.php
+++ b/inc/theme-settings/mt-theme-settings.php
@@ -167,7 +167,7 @@ if ( ! class_exists( 'sophia_after_dark_Settings' ) ) :
 					</button>
 				</div>
 				
-			</div><!-- #mt-theme-message -->
+			</div>
 	<?php
 		}
 
@@ -191,7 +191,7 @@ if ( ! class_exists( 'sophia_after_dark_Settings' ) ) :
 					<span class="theme-version"><?php printf( esc_html__( 'Version: %1$s', 'sophia-after-dark' ), $sophia_after_dark_theme_version ); ?></span>
 					<span class="author-link"><?php printf( wp_kses_post( 'By <a href="%1$s" target="_blank">%2$s</a>', 'sophia-after-dark' ), $author_uri, $author_name ); ?></span>
 				</div>
-			</div><!-- .sophia-after-dark-theme-info -->
+			</div>
 
 			<div class="mt-upgrader-pro">
 				<div class="mt-upgrade-title-wrap">
@@ -199,7 +199,7 @@ if ( ! class_exists( 'sophia_after_dark_Settings' ) ) :
 					<div class="mt-upgrader-text"><?php esc_html_e( 'Upgrade to pro version for additional features and better supports.', 'sophia-after-dark' ); ?></div>
 				</div>
 				<div class="mt-upgrader-btn"> <a href="<?php echo esc_url( 'https://mysterythemes.com/wp-themes/color-blog-pro/' ); ?>" target="_blank" class="button button-primary"><?php esc_html_e( 'Unlock Features With Pro', 'sophia-after-dark' ); ?></a> </div>
-			</div><!-- .mt-upgrader-pro -->
+			</div>
 
 			<div class="mt-nav-tab-content-wrapper">
 				<div class="nav-tab-wrapper">
@@ -219,7 +219,7 @@ if ( ! class_exists( 'sophia_after_dark_Settings' ) ) :
 					<a class="nav-tab <?php if ( isset( $_GET['tab'] ) && $_GET['tab'] == 'changelog' ) echo 'nav-tab-active'; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'sophia-after-dark-settings', 'tab' => 'changelog' ), 'themes.php' ) ) ); ?>">
 						<span class="dashicons dashicons-flag"></span> <?php esc_html_e( 'Changelog', 'sophia-after-dark' ); ?>
 					</a>
-				</div><!-- .nav-tab-wrapper -->
+				</div>
 	<?php
 		}
 
@@ -309,7 +309,7 @@ if ( ! class_exists( 'sophia_after_dark_Settings' ) ) :
 									</ul>
 								</div>
 							</div>
-						</div><!-- .theme-features-wrap -->
+						</div>
 
 						<div class="return-to-dashboard sophia-after-dark">
 							<?php if ( current_user_can( 'update_core' ) && isset( $_GET['updated'] ) ) : ?>
@@ -318,10 +318,10 @@ if ( ! class_exists( 'sophia_after_dark_Settings' ) ) :
 								</a> |
 							<?php endif; ?>
 							<a href="<?php echo esc_url( self_admin_url() ); ?>"><?php is_blog_admin() ? esc_html_e( 'Go to Dashboard &rarr; Home', 'sophia-after-dark' ) : esc_html_e( 'Go to Dashboard', 'sophia-after-dark' ); ?></a>
-						</div><!-- .return-to-dashboard -->
-					</div><!-- .mt-nav-content-wrap -->
-				</div><!-- .mt-nav-tab-content-wrapper -->
-			</div><!-- .about-wrap -->
+						</div>
+					</div>
+				</div>
+			</div>
 	<?php
 		}
 
@@ -370,7 +370,7 @@ if ( ! class_exists( 'sophia_after_dark_Settings' ) ) :
 															<a href="<?php echo esc_url ( $demourl ); ?>" target="_blank">
 																<img class="mtdi_gl-item-image" src="<?php echo esc_url ( $preview_screenshot ); ?>" />
 															</a>
-														</div><!-- .mtdi-preview-screenshot -->
+														</div>
 														<div class="theme-id-container">
 															<h2 class="mtdi-theme-name theme-name" id="nokri-name"><?php echo esc_html ( $theme_name ); ?></h2>
 															<div class="mtdi-theme-actions theme-actions">
@@ -407,23 +407,23 @@ if ( ! class_exists( 'sophia_after_dark_Settings' ) ) :
 																	<a class="button preview install-demo-preview" target="_blank" href="<?php echo esc_url ( $demourl ); ?>">
 																		<?php esc_html_e( 'View Demo', 'sophia-after-dark' ); ?>
 																	</a>
-															</div><!-- .mtdi-theme-actions -->
-														</div><!-- .theme-id-container -->
-													</div><!-- .mtdi-each-demo -->
+															</div>
+														</div>
+													</div>
 										<?php
 												}
 											}
 										?>
-										</div><!-- .themes -->
-									</div><!-- .mtdi-demo-wrapper -->
+										</div>
+									</div>
 							<?php
 								}
 							?>
 							</div>
-						</div><!-- .theme-browser -->
-					</div><!-- .mt-nav-content-wrap -->
-				</div><!-- .mt-nav-tab-content-wrapper -->
-			</div><!-- .wrap.about-wrap -->
+						</div>
+					</div>
+				</div>
+			</div>
 	<?php
 		}
 		
@@ -451,8 +451,8 @@ if ( ! class_exists( 'sophia_after_dark_Settings' ) ) :
 								echo wp_kses_post( $changelog_list );
 							}
 						?>
-					</div><!-- .mt-nav-content-wrap -->
-				</div><!-- .mt-nav-tab-content-wrapper -->
+					</div>
+				</div>
 			</div>
 		<?php
 		}
@@ -569,9 +569,9 @@ if ( ! class_exists( 'sophia_after_dark_Settings' ) ) :
 								</tr>
 							</tbody>
 						</table>
-					</div><!-- .mt-nav-content-wrap -->
-				</div><!-- .mt-nav-tab-content-wrapper -->
-			</div><!-- .about-wrap -->
+					</div>
+				</div>
+			</div>
 	<?php
 		}
 
@@ -761,8 +761,8 @@ if ( ! class_exists( 'sophia_after_dark_Settings' ) ) :
 								}
 							}
 						?>
-					</div><!-- .mt-popup-inner-wrap -->
-				</div><!-- .mt-demo-import-plugin-popup -->
+					</div>
+				</div>
 			<?php
 		}
 
diff --git a/inc/widgets/mt-author-info.php b/inc/widgets/mt-author-info.php
index 41d09d6..28fee88 100644
--- a/inc/widgets/mt-author-info.php
+++ b/inc/widgets/mt-author-info.php
@@ -108,9 +108,9 @@ class sophia_after_dark_Author_Info extends WP_widget {
                     <div class="author-description"><?php echo wp_kses_post( wpautop( get_the_author_meta( 'description', $sophia_after_dark_user_id ) ) ); ?></div>
                     <div class="author-social">
                         <?php sophia_after_dark_social_media_content(); ?>
-                    </div><!-- .author-social -->
-                </div><!-- .author-bio-wrap -->
-            </div><!-- .mt-author-info-wrapper -->
+                    </div>
+                </div>
+            </div>
     <?php
         echo $after_widget;
     }
diff --git a/inc/widgets/mt-latest-posts.php b/inc/widgets/mt-latest-posts.php
index 409cd85..bdc17b1 100644
--- a/inc/widgets/mt-latest-posts.php
+++ b/inc/widgets/mt-latest-posts.php
@@ -115,13 +115,13 @@ class sophia_after_dark_Latest_Posts extends WP_widget {
                                         </div>
                                         <?php sophia_after_dark_widget_entry_footer(); ?>
                                     </div>
-                                </div><!-- .mt-single-post-wrap -->
+                                </div>
                     <?php
                             }
                         }
                     ?>
-                </div><!-- .mt-posts-content-wrapper -->
-            </div><!-- .mt-latest-posts-wrapper -->
+                </div>
+            </div>
     <?php
         echo $after_widget;
     }
diff --git a/inc/widgets/mt-social-media.php b/inc/widgets/mt-social-media.php
index c699dd7..50b0c7b 100644
--- a/inc/widgets/mt-social-media.php
+++ b/inc/widgets/mt-social-media.php
@@ -69,8 +69,8 @@ class sophia_after_dark_Social_Media extends WP_widget {
                 ?>
                 <div class="mt-social-icons-wrapper">
                     <?php sophia_after_dark_social_media_content(); ?>
-                </div><!-- .mt-social-icons-wrapper -->
-            </div><!-- .mt-aside-social-wrapper -->
+                </div>
+            </div>
     <?php
         echo $after_widget;
     }
diff --git a/index.php b/index.php
index 504a883..a2f936a 100644
--- a/index.php
+++ b/index.php
@@ -44,8 +44,8 @@ get_header();
 
 				if ( 'mt-archive--masonry-style' === $archive_style ) {
 			?>
-						</div><!-- #mt-masonry -->
-					</div><!-- .sophia-after-dark-content-masonry -->
+						</div>
+					</div>
 			<?php
 				}
 
@@ -58,9 +58,9 @@ get_header();
 			echo '</div>';
 		}
 		?>
-		</main><!-- #main -->
-	</div><!-- #primary -->
+		</main>
+	</div>
 	<?php get_sidebar(); ?>
-</div><!-- .mt-page-content-wrapper -->
+</div>
 <?php
 get_footer();
\ No newline at end of file
diff --git a/page.php b/page.php
index cc1dc02..d7dc1d2 100644
--- a/page.php
+++ b/page.php
@@ -29,9 +29,9 @@ get_header();
 			endif;
 		endwhile; // End of the loop.
 		?>
-		</main><!-- #main -->
-	</div><!-- #primary -->
+		</main>
+	</div>
 	<?php get_sidebar(); ?>
-</div><!-- .mt-page-content-wrapper -->
+</div>
 <?php
 get_footer();
\ No newline at end of file
diff --git a/search.php b/search.php
index 3208057..0228ea6 100644
--- a/search.php
+++ b/search.php
@@ -37,8 +37,8 @@ get_header();
 
 				if ( 'mt-archive--masonry-style' === $archive_style ) {
 			?>
-						</div><!-- #mt-masonry -->
-					</div><!-- .sophia-after-dark-content-masonry -->
+						</div>
+					</div>
 			<?php
 				}
 
@@ -50,9 +50,9 @@ get_header();
 			echo '</div>';
 		}	
 		?>
-		</main><!-- #main -->
-	</section><!-- #primary -->
+		</main>
+	</section>
 	<?php get_sidebar(); ?>
-</div><!-- .mt-page-content-wrapper -->
+</div>
 <?php
 get_footer();
\ No newline at end of file
diff --git a/sidebar-footer.php b/sidebar-footer.php
index 029c948..f2fd602 100644
--- a/sidebar-footer.php
+++ b/sidebar-footer.php
@@ -48,7 +48,7 @@ $sophia_after_dark_widget_area_layout = get_theme_mod( 'sophia_after_dark_widget
 						<?php dynamic_sidebar( 'footer-sidebar-4' ); ?>
 					</div>
 				<?php } ?>
-			</div><!-- .mt-footer-widget-wrapper -->
-		</div><!-- .footer-widgets-area -->
-	</div><!-- .mt-container -->
-</div><!-- .footer-widgets-wrapper -->
\ No newline at end of file
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/sidebar.php b/sidebar.php
index ebda445..eea9d4a 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -14,4 +14,4 @@ if ( ! is_active_sidebar( 'sidebar-1' ) ) {
 ?>
 <aside id="secondary" class="widget-area">
 	<?php dynamic_sidebar( 'sidebar-1' ); ?>
-</aside><!-- #secondary -->
\ No newline at end of file
+</aside>
\ No newline at end of file
diff --git a/single.php b/single.php
index 26a4adb..e96e3e6 100644
--- a/single.php
+++ b/single.php
@@ -32,9 +32,9 @@ get_header();
 				get_template_part( 'template-parts/related/related', 'posts' );
 			}
 		?>
-		</main><!-- #main -->
-	</div><!-- #primary -->
+		</main>
+	</div>
 	<?php get_sidebar(); ?>
-</div><!-- .mt-page-content-wrapper -->
+</div>
 <?php
 get_footer();
\ No newline at end of file
diff --git a/template-parts/author/post-author-box.php b/template-parts/author/post-author-box.php
index e612daf..ce7a7cd 100644
--- a/template-parts/author/post-author-box.php
+++ b/template-parts/author/post-author-box.php
@@ -17,7 +17,7 @@ $author_url        = get_the_author_meta( 'user_url' );
 	<?php if ( $author_avatar ) { ?>
 		<div itemprop="image" class="mt-author__avatar">
 			<?php echo wp_kses_post( $author_avatar ); ?>
-		</div><!-- .mt-author-avatar -->
+		</div>
 	<?php } ?>
 
 	<div class="mt-author-info">
@@ -28,7 +28,7 @@ $author_url        = get_the_author_meta( 'user_url' );
 		<?php if ( $author_bio ) { ?>
 			<div class="mt-author-bio">
 				<?php echo wp_kses_post( $author_bio ); ?>
-			</div><!-- .mt-author-bio -->
+			</div>
 		<?php } ?>
 
 		<div class="mt-author-meta">
@@ -36,8 +36,8 @@ $author_url        = get_the_author_meta( 'user_url' );
 				<div class="mt-author-website">
 					<span><?php esc_html_e( 'Website', 'sophia-after-dark' ); ?>&#58;</span>
 					<a href="<?php echo esc_url( $author_url ); ?>" target="_blank"><?php echo esc_url( $author_url ); ?></a>
-				</div><!-- .mt-author-website -->
+				</div>
 			<?php } ?>
-		</div><!-- .mt-author-meta -->
-	</div><!-- .mt-author-info -->
-</div><!-- .mt-author-bio -->
\ No newline at end of file
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/template-parts/content-none.php b/template-parts/content-none.php
index 7685298..550d987 100644
--- a/template-parts/content-none.php
+++ b/template-parts/content-none.php
@@ -12,7 +12,7 @@
 <section class="no-results not-found">
 	<header class="page-header">
 		<h1 class="page-title"><?php esc_html_e( 'Nothing Found', 'sophia-after-dark' ); ?></h1>
-	</header><!-- .page-header -->
+	</header>
 
 	<div class="page-content">
 		<?php
@@ -41,5 +41,5 @@
 			get_search_form();
 		endif;
 		?>
-	</div><!-- .page-content -->
-</section><!-- .no-results -->
\ No newline at end of file
+	</div>
+</section>
\ No newline at end of file
diff --git a/template-parts/content-page.php b/template-parts/content-page.php
index de6c469..2db540a 100644
--- a/template-parts/content-page.php
+++ b/template-parts/content-page.php
@@ -18,7 +18,7 @@
 				'after'  => '</div>',
 			) );
 		?>
-	</div><!-- .entry-content -->
+	</div>
 
 	<?php if ( get_edit_post_link() ) : ?>
 		<footer class="entry-footer">
@@ -40,6 +40,6 @@
 					'</span>'
 				);
 			?>
-		</footer><!-- .entry-footer -->
+		</footer>
 	<?php endif; ?>
-</article><!-- #post-<?php the_ID(); ?> -->
\ No newline at end of file
+</article>
\ No newline at end of file
diff --git a/template-parts/content-search.php b/template-parts/content-search.php
index d4b3656..6770458 100644
--- a/template-parts/content-search.php
+++ b/template-parts/content-search.php
@@ -20,7 +20,7 @@ if ( has_post_thumbnail() ) {
 		echo '<div class="thumb-cat-wrap">';
 			sophia_after_dark_post_thumbnail();
 			sophia_after_dark_article_categories_list();
-		echo '</div><!-- .thumb-cat-wrap -->';
+		echo '</div>';
 		if ( 'post' === get_post_type() ) {
 	?>
 		<div class="entry-cat">
@@ -28,12 +28,12 @@ if ( has_post_thumbnail() ) {
 				sophia_after_dark_posted_on();
 				sophia_after_dark_posted_by();
 			?>
-		</div><!-- .entry-meta -->
+		</div>
 	<?php } ?>
 
 	<header class="entry-header">
 		<?php the_title( '<h2 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h2>' ); ?>
-	</header><!-- .entry-header -->
+	</header>
 
 	<div class="entry-content">
 		<?php
@@ -54,9 +54,9 @@ if ( has_post_thumbnail() ) {
 				) );
 			}
 		?>
-	</div><!-- .entry-content -->
+	</div>
 
 	<footer class="entry-footer">
 		<?php sophia_after_dark_entry_footer(); ?>
-	</footer><!-- .entry-footer -->
-</article><!-- #post-<?php the_ID(); ?> -->
\ No newline at end of file
+	</footer>
+</article>
\ No newline at end of file
diff --git a/template-parts/content-single.php b/template-parts/content-single.php
index 52744e0..aa45c3d 100644
--- a/template-parts/content-single.php
+++ b/template-parts/content-single.php
@@ -31,8 +31,8 @@ if ( has_post_thumbnail() ) {
 				?> 
 			</div>
 			<?php the_title( '<h3 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h3>' ); ?>
-	    </div><!--.post-info-wrap -->
-	</div><!-- .post-thumbnail -->
+	    </div>
+	</div>
 
 	<div class="entry-content">
 		<?php
@@ -53,10 +53,10 @@ if ( has_post_thumbnail() ) {
 		        'after'  => '</div>',
 		    ) );
 		?>
-	</div> <!-- .entry-content -->
+	</div> 
 
 	<footer class="entry-footer">
 		<?php sophia_after_dark_entry_footer(); ?>
-	</footer><!-- .entry-footer -->
+	</footer>
 	<?php get_template_part( 'template-parts/author/post', 'author-box' ); ?>
-</article><!-- #post-<?php the_ID(); ?> -->
\ No newline at end of file
+</article>
\ No newline at end of file
diff --git a/template-parts/content.php b/template-parts/content.php
index a193c2f..be3fb6d 100644
--- a/template-parts/content.php
+++ b/template-parts/content.php
@@ -29,7 +29,7 @@ if ( $current_post < 3 && 'mt-archive--masonry-style' === $archive_style ) {
 		echo '<div class="thumb-cat-wrap">';
 			sophia_after_dark_post_thumbnail();
 			sophia_after_dark_article_categories_list();
-		echo '</div><!-- .thumb-cat-wrap -->';
+		echo '</div>';
 		if ( 'post' === get_post_type() ) {
 	?>
 		<div class="entry-cat">
@@ -37,12 +37,12 @@ if ( $current_post < 3 && 'mt-archive--masonry-style' === $archive_style ) {
 				sophia_after_dark_posted_on();
 				sophia_after_dark_posted_by();
 			?>
-		</div><!-- .entry-meta -->
+		</div>
 	<?php } ?>
 
 	<header class="entry-header">
 		<?php the_title( '<h2 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h2>' ); ?>
-	</header><!-- .entry-header -->
+	</header>
 
 	<div class="entry-content">
 		<?php
@@ -63,9 +63,9 @@ if ( $current_post < 3 && 'mt-archive--masonry-style' === $archive_style ) {
 				) );
 			}
 		?>
-	</div><!-- .entry-content -->
+	</div>
 
 	<footer class="entry-footer">
 		<?php sophia_after_dark_entry_footer(); ?>
-	</footer><!-- .entry-footer -->
-</article><!-- #post-<?php the_ID(); ?> -->
\ No newline at end of file
+	</footer>
+</article>
\ No newline at end of file
diff --git a/template-parts/related/content-related.php b/template-parts/related/content-related.php
index 78aa7c3..3bb813a 100644
--- a/template-parts/related/content-related.php
+++ b/template-parts/related/content-related.php
@@ -18,7 +18,7 @@ if ( has_post_thumbnail() ) {
 		echo '<div class="thumb-cat-wrap">';
 			sophia_after_dark_post_thumbnail();
 			sophia_after_dark_article_categories_list();
-		echo '</div><!-- .thumb-cat-wrap -->';
+		echo '</div>';
 		if ( 'post' === get_post_type() ) {
 	?>
 		<div class="entry-cat">
@@ -26,14 +26,14 @@ if ( has_post_thumbnail() ) {
 				sophia_after_dark_posted_on(); 
 				sophia_after_dark_posted_by(); 
 			?>
-		</div><!-- .entry-meta -->
+		</div>
 	<?php } ?>
 
 	<header class="entry-header">
 		<?php the_title( '<h2 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h2>' ); ?>
-	</header><!-- .entry-header -->	
+	</header>	
 
 	<footer class="entry-footer">
 		<?php sophia_after_dark_entry_footer(); ?>
-	</footer><!-- .entry-footer -->
-</article><!-- #post-<?php the_ID(); ?> -->
\ No newline at end of file
+	</footer>
+</article>
\ No newline at end of file
diff --git a/template-parts/related/related-posts.php b/template-parts/related/related-posts.php
index ddc8046..2fc9090 100644
--- a/template-parts/related/related-posts.php
+++ b/template-parts/related/related-posts.php
@@ -37,8 +37,8 @@ if ( $related_posts_query->have_posts() ) {
 					get_template_part( 'template-parts/related/content', 'related' );
 				}
 			?>
-		</div><!-- .mt-related-posts-wrapper -->
-	</section><!-- .mt-single-related-posts -->
+		</div>
+	</section>
 <?php
 }
 wp_reset_postdata();