diff --git a/404.php b/404.php
index 8ce2ebd2c..e7270b4f4 100644
--- a/404.php
+++ b/404.php
@@ -24,6 +24,6 @@ get_header(); ?>
 			</article><!-- #post-0 -->
 
 		</div><!-- #content -->
-	</div><!-- #primary .site-content -->
+	</div><!-- #primary -->
 
 <?php get_footer(); ?>
\ No newline at end of file
diff --git a/archive.php b/archive.php
index 3eda7da0b..25d61bf31 100644
--- a/archive.php
+++ b/archive.php
@@ -49,7 +49,7 @@ get_header(); ?>
 							echo '<div class="archive-meta">' . $category_description . '</div>';
 					}
 				?>
-			</header><!-- /. archive-header -->
+			</header><!-- .archive-header -->
 
 			<?php
 			/* Start the Loop */
@@ -71,7 +71,7 @@ get_header(); ?>
 		<?php endif; ?>
 
 		</div><!-- #content -->
-	</section><!-- #primary .site-content -->
+	</section><!-- #primary -->
 
 <?php get_sidebar(); ?>
 <?php get_footer(); ?>
\ No newline at end of file
diff --git a/author.php b/author.php
index 094b9f0ab..bf77d7be8 100644
--- a/author.php
+++ b/author.php
@@ -26,7 +26,7 @@ get_header(); ?>
 
 			<header class="archive-header">
 				<h1 class="archive-title"><?php printf( __( 'Author Archives: %s', 'twentytwelve' ), '<span class="vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( "ID" ) ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' ); ?></h1>
-			</header>
+			</header><!-- .archive-header -->
 
 			<?php
 				/* Since we called the_post() above, we need to
@@ -64,7 +64,7 @@ get_header(); ?>
 		<?php endif; ?>
 
 		</div><!-- #content -->
-	</section><!-- #primary .site-content -->
+	</section><!-- #primary -->
 
 <?php get_sidebar(); ?>
 <?php get_footer(); ?>
\ No newline at end of file
diff --git a/content-aside.php b/content-aside.php
index ec23299d5..cc01a0d96 100644
--- a/content-aside.php
+++ b/content-aside.php
@@ -14,7 +14,7 @@
 		<div class="entry-content">
 			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentytwelve' ) ); ?>
 		</div><!-- .entry-content -->
-	</div>
+	</div><!-- .aside -->
 
 	<footer class="entry-meta">
 		<?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<div class="edit-link">', '</div>' ); ?>
diff --git a/content-none.php b/content-none.php
index 4e6083582..aa74ca133 100644
--- a/content-none.php
+++ b/content-none.php
@@ -11,7 +11,7 @@
 		<article id="post-0" class="post no-results not-found">
 			<header class="entry-header">
 				<h1 class="entry-title"><?php _e( 'Nothing Found', 'twentytwelve' ); ?></h1>
-			</header><!-- .entry-header -->
+			</header>
 
 			<div class="entry-content">
 				<p><?php _e( 'Apologies, but no results were found. Perhaps searching will help find a related post.', 'twentytwelve' ); ?></p>
diff --git a/content-page.php b/content-page.php
index 3a44fb147..e13eb6a24 100644
--- a/content-page.php
+++ b/content-page.php
@@ -11,7 +11,7 @@
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<header class="entry-header">
 		<h1 class="entry-title"><?php the_title(); ?></h1>
-	</header><!-- .entry-header -->
+	</header>
 
 	<div class="entry-content">
 		<?php the_content(); ?>
diff --git a/footer.php b/footer.php
index f53ae6aba..ea7408259 100644
--- a/footer.php
+++ b/footer.php
@@ -2,7 +2,8 @@
 /**
  * The template for displaying the footer.
  *
- * Contains the closing of the id=main div and all content after
+ * Contains footer content and the closing of the 
+ * #main and #page div elements.
  *
  * @package WordPress
  * @subpackage Twenty_Twelve
@@ -16,7 +17,7 @@
 			<a href="<?php echo esc_url( __( 'http://wordpress.org/', 'twentytwelve' ) ); ?>" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'twentytwelve' ); ?>" rel="generator"><?php printf( __( 'Proudly powered by %s', 'twentytwelve' ), 'WordPress' ); ?></a>
 		</div><!-- .site-info -->
 	</footer><!-- #colophon -->
-</div><!-- #page .site -->
+</div><!-- #page -->
 
 <?php wp_footer(); ?>
 </body>
diff --git a/full-width-page.php b/full-width-page.php
index 9217730e7..ebf71e1f2 100644
--- a/full-width-page.php
+++ b/full-width-page.php
@@ -18,6 +18,6 @@ get_header(); ?>
 			<?php endwhile; // end of the loop. ?>
 
 		</div><!-- #content -->
-	</div><!-- #primary .site-content -->
+	</div><!-- #primary -->
 
 <?php get_footer(); ?>
\ No newline at end of file
diff --git a/functions.php b/functions.php
index 674da8734..5d9c82a45 100644
--- a/functions.php
+++ b/functions.php
@@ -289,16 +289,16 @@ function twentytwelve_comment( $comment, $args, $depth ) {
 						sprintf( __( '%1$s at %2$s', 'twentytwelve' ), get_comment_date(), get_comment_time() )
 					);
 				?>
-			</header>
+			</header><!-- .comment-meta -->
 
 			<?php if ( '0' == $comment->comment_approved ) : ?>
 				<p class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'twentytwelve' ); ?></p>
 			<?php endif; ?>
 
-			<section class="comment comment-content">
+			<section class="comment-content comment">
 				<?php comment_text(); ?>
 				<?php edit_comment_link( __( 'Edit', 'twentytwelve' ), '<p class="edit-link">', '</p>' ); ?>
-			</section>
+			</section><!-- .comment-content -->
 
 			<div class="reply">
 				<?php comment_reply_link( array_merge( $args, array( 'reply_text' => __( 'Reply <span>&darr;</span>', 'twentytwelve' ), 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
diff --git a/header.php b/header.php
index 2e4bf62a5..7bcfc6016 100644
--- a/header.php
+++ b/header.php
@@ -39,7 +39,7 @@
 			<h3 class="menu-toggle"><?php _e( 'Show menu', 'twentytwelve' ); ?></h3>
 			<div class="skip-link assistive-text"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentytwelve' ); ?>"><?php _e( 'Skip to content', 'twentytwelve' ); ?></a></div>
 			<?php wp_nav_menu( array( 'theme_location' => 'primary', 'menu_class' => 'nav-menu' ) ); ?>
-		</nav>
+		</nav><!-- #site-navigation -->
 
 		<?php $header_image = get_header_image();
 		if ( ! empty( $header_image ) ) : ?>
diff --git a/homepage.php b/homepage.php
index 974909529..98b81aaf0 100644
--- a/homepage.php
+++ b/homepage.php
@@ -13,18 +13,18 @@ get_header(); ?>
 		<div id="content" role="main">
 
 			<?php while ( have_posts() ) : the_post(); ?>
-				<?php if ( has_post_thumbnail() ) { ?>
+				<?php if ( has_post_thumbnail() ) : ?>
 					<div class="entry-page-image">
 						<?php the_post_thumbnail(); ?>
-					</div>
-				<?php } ?>
+					</div><!-- .entry-page-image -->
+				<?php endif; ?>
 
 				<?php get_template_part( 'content', 'page' ); ?>
 
 			<?php endwhile; // end of the loop. ?>
 
 		</div><!-- #content -->
-	</div><!-- #primary .site-content -->
+	</div><!-- #primary -->
 
 <?php get_sidebar( 'home' ); ?>
 <?php get_footer(); ?>
\ No newline at end of file
diff --git a/image.php b/image.php
index 0b16c5378..404abd9b8 100644
--- a/image.php
+++ b/image.php
@@ -97,6 +97,6 @@ if ( count( $attachments ) > 1 ) {
 			<?php endwhile; // end of the loop. ?>
 
 		</div><!-- #content -->
-	</div><!-- #primary .site-content -->
+	</div><!-- #primary -->
 
 <?php get_footer(); ?>
\ No newline at end of file
diff --git a/index.php b/index.php
index 52daad452..ee335f0ae 100644
--- a/index.php
+++ b/index.php
@@ -35,7 +35,7 @@ get_header(); ?>
 			?>
 				<header class="entry-header">
 					<h1 class="entry-title"><?php _e( 'No posts to display', 'twentytwelve' ); ?></h1>
-				</header><!-- .entry-header -->
+				</header>
 
 				<div class="entry-content">
 					<p><?php printf( __( 'Ready to publish your first post? <a href="%s">Get started here</a>.', 'twentytwelve' ), admin_url( 'post-new.php' ) ); ?></p>
@@ -46,7 +46,7 @@ get_header(); ?>
 			?>
 				<header class="entry-header">
 					<h1 class="entry-title"><?php _e( 'Nothing found', 'twentytwelve' ); ?></h1>
-				</header><!-- .entry-header -->
+				</header>
 
 				<div class="entry-content">
 					<p><?php _e( 'Apologies, but no results were found for the requested archive. Perhaps searching will help find a related post.', 'twentytwelve' ); ?></p>
@@ -59,7 +59,7 @@ get_header(); ?>
 		<?php endif; // end have_posts() check ?>
 
 		</div><!-- #content -->
-	</div><!-- #primary .site-content -->
+	</div><!-- #primary -->
 
 <?php get_sidebar(); ?>
 <?php get_footer(); ?>
\ No newline at end of file
diff --git a/page.php b/page.php
index 59c786400..dcda990c2 100644
--- a/page.php
+++ b/page.php
@@ -23,7 +23,7 @@ get_header(); ?>
 			<?php endwhile; // end of the loop. ?>
 
 		</div><!-- #content -->
-	</div><!-- #primary .site-content -->
+	</div><!-- #primary -->
 
 <?php get_sidebar(); ?>
 <?php get_footer(); ?>
\ No newline at end of file
diff --git a/search.php b/search.php
index ace9fa93a..4eea82c23 100644
--- a/search.php
+++ b/search.php
@@ -32,7 +32,7 @@ get_header(); ?>
 			<article id="post-0" class="post no-results not-found">
 				<header class="entry-header">
 					<h1 class="entry-title"><?php _e( 'Nothing Found', 'twentytwelve' ); ?></h1>
-				</header><!-- .entry-header -->
+				</header>
 
 				<div class="entry-content">
 					<p><?php _e( 'Sorry, but nothing matched your search criteria. Please try again with some different keywords.', 'twentytwelve' ); ?></p>
@@ -43,7 +43,7 @@ get_header(); ?>
 		<?php endif; ?>
 
 		</div><!-- #content -->
-	</section><!-- #primary .site-content -->
+	</section><!-- #primary -->
 
 <?php get_sidebar(); ?>
 <?php get_footer(); ?>
\ No newline at end of file
diff --git a/sidebar-home.php b/sidebar-home.php
index b46a1f5d0..2712b9b2d 100644
--- a/sidebar-home.php
+++ b/sidebar-home.php
@@ -24,12 +24,12 @@ if ( ! is_active_sidebar( 2 ) && ! is_active_sidebar( 3 ) )
 	<?php if ( is_active_sidebar( 2 ) ) : ?>
 	<div class="first home-widgets">
 		<?php dynamic_sidebar( 'sidebar-2' ); ?>
-	</div><!-- .first .home-widgets -->
+	</div><!-- .first -->
 	<?php endif; ?>
 
 	<?php if ( is_active_sidebar( 3 ) ) : ?>
 	<div class="second home-widgets">
 		<?php dynamic_sidebar( 'sidebar-3' ); ?>
-	</div><!-- .second .home-widgets -->
+	</div><!-- .second -->
 	<?php endif; ?>
-</div><!-- #secondary .widget-area -->
\ No newline at end of file
+</div><!-- #secondary -->
\ No newline at end of file
diff --git a/sidebar.php b/sidebar.php
index 694035dd8..2bc4969ae 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -13,5 +13,5 @@
 	<?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>
 		<div id="secondary" class="widget-area" role="complementary">
 			<?php dynamic_sidebar( 'sidebar-1' ); ?>
-		</div><!-- #secondary .widget-area -->
+		</div><!-- #secondary -->
 	<?php endif; ?>
\ No newline at end of file
diff --git a/single.php b/single.php
index 8631a49af..6be1baa7d 100644
--- a/single.php
+++ b/single.php
@@ -31,7 +31,7 @@ get_header(); ?>
 			<?php endwhile; // end of the loop. ?>
 
 		</div><!-- #content -->
-	</div><!-- #primary .site-content -->
+	</div><!-- #primary -->
 
 <?php get_sidebar(); ?>
 <?php get_footer(); ?>
\ No newline at end of file