diff --git a/404.php b/404.php
index 4e4b84f..14160ee 100644
--- a/404.php
+++ b/404.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The template for displaying 404 pages (not found).
+ * The template for displaying 404 pages (not found)
  *
  * @link https://codex.wordpress.org/Creating_an_Error_404_Page
  *
diff --git a/archive.php b/archive.php
index f4b277e..25b5b96 100644
--- a/archive.php
+++ b/archive.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The template for displaying archive pages.
+ * The template for displaying archive pages
  *
  * @link https://codex.wordpress.org/Template_Hierarchy
  *
diff --git a/comments.php b/comments.php
index 41cfd0b..8654df5 100644
--- a/comments.php
+++ b/comments.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The template for displaying comments.
+ * The template for displaying comments
  *
  * This is the template that displays the area of the page that contains both the current comments
  * and the comment form.
@@ -33,7 +33,7 @@
 					'<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 id="comment-nav-above" class="navigation comment-navigation" role="navigation">
diff --git a/footer.php b/footer.php
index ae1bd15..c4ce31e 100644
--- a/footer.php
+++ b/footer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The template for displaying the footer.
+ * The template for displaying the footer
  *
  * Contains the closing of the #content div and all content after.
  *
diff --git a/functions.php b/functions.php
index 0dd0fe3..d24ede4 100644
--- a/functions.php
+++ b/functions.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * DevriX Starter functions and definitions.
+ * DevriX Starter functions and definitions
  *
  * @link https://developer.wordpress.org/themes/basics/theme-functions/
  *
@@ -34,7 +34,7 @@
 require get_template_directory() . '/inc/jetpack.php';
 
 /**
- * Better support for responsive images out of the box
+ * Better support for responsive images out of the box.
  */
 require get_template_directory() . '/inc/images.php';
 
@@ -75,7 +75,7 @@ function dxstarter_setup() {
 	add_theme_support( 'post-thumbnails' );
 
 	/**
-	 * Sample post thumbnail sizes. Change these to fit your theme
+	 * Sample post thumbnail sizes. Change these to fit your theme.
 	 *
 	 * @since  DX Starter 1.1.0
 	 */
@@ -164,10 +164,10 @@ function dxstarter_scripts() {
 		}
 	}
 
-	// Enqueue the only styling file here that is build with Gulp
+	// Enqueue the only styling file here that is build with Gulp.
 	wp_enqueue_style( 'stylesheet', get_template_directory_uri() . '/assets/css/master' . $suffix . '.css' );
 	
-	// And the only JS file that is build with Gulp
+	// And the only JS file that is build with Gulp.
 	wp_enqueue_script( 'scripts', get_template_directory_uri() . '/assets/scripts/bundle' . $suffix . '.js', array( "jquery" ), '20170204', true );
 
 
@@ -178,7 +178,7 @@ function dxstarter_scripts() {
 add_action( 'wp_enqueue_scripts', 'dxstarter_scripts' );
 
 /**
- * Remove the margin-top styling added to the HTML tag by default from WordPress
+ * Remove the margin-top styling added to the HTML tag by default from WordPress.
  */
 function dxstarter_remove_html_margin() {
 	remove_action( 'wp_head', '_admin_bar_bump_cb' );
diff --git a/header.php b/header.php
index 467f31f..66935d8 100644
--- a/header.php
+++ b/header.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The header for our theme.
+ * The header for our theme
  *
  * This is the template that displays all of the <head> section and everything up until <div id="content">
  *
@@ -53,8 +53,8 @@
 						</div><!-- .menu-primary-container -->
 					</nav><!-- #site-navigation -->
 				</div><!-- .site-header-inner -->
-			</div><!-- /columns -->
-		</div><!-- /row -->
-	</header><!-- #site-header -->
+			</div><!-- .columns -->
+		</div><!-- .row -->
+	</header><!-- #masthead -->
 
 	<div id="content" class="site-content">
diff --git a/inc/custom-header.php b/inc/custom-header.php
index 14504df..ac5e5a3 100644
--- a/inc/custom-header.php
+++ b/inc/custom-header.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Sample implementation of the Custom Header feature.
+ * Sample implementation of the Custom Header feature
  *
  * You can add an optional custom header image to header.php like so ...
  *
@@ -14,9 +14,8 @@
  *
  * @package DX Starter
  */
-
 /**
- * Sample implementation of the Custom Header feature.
+ * Sample implementation of the Custom Header feature
  *
  * @link https://developer.wordpress.org/themes/functionality/custom-headers/
  *
diff --git a/inc/customizer.php b/inc/customizer.php
index 4e0ee00..2dcbbf3 100644
--- a/inc/customizer.php
+++ b/inc/customizer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * DevriX Starter Theme Customizer.
+ * DevriX Starter Theme Customizer
  *
  * @package DevriX_Starter
  */
diff --git a/inc/extras.php b/inc/extras.php
index 1d6a8ba..9df8416 100644
--- a/inc/extras.php
+++ b/inc/extras.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Custom functions that act independently of the theme templates.
+ * Custom functions that act independently of the theme templates
  *
  * Eventually, some of the functionality here could be replaced by core features.
  *
diff --git a/inc/images.php b/inc/images.php
index c057b7a..3cde217 100644
--- a/inc/images.php
+++ b/inc/images.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Add custom image sizes attribute to enhance responsive image functionality
  * for post thumbnails
diff --git a/inc/jetpack.php b/inc/jetpack.php
index 40e4a8a..c1879be 100644
--- a/inc/jetpack.php
+++ b/inc/jetpack.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Jetpack Compatibility File.
+ * Jetpack Compatibility File
  *
  * @link https://jetpack.me/
  *
diff --git a/inc/template-tags.php b/inc/template-tags.php
index fb87a51..b0954fe 100644
--- a/inc/template-tags.php
+++ b/inc/template-tags.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Custom template tags for this theme.
+ * Custom template tags for this theme
  *
  * Eventually, some of the functionality here could be replaced by core features.
  *
diff --git a/index.php b/index.php
index e5b32d4..066f6eb 100644
--- a/index.php
+++ b/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The main template file.
+ * The main template file
  *
  * This is the most generic template file in a WordPress theme
  * and one of the two required files for a theme (the other being style.css).
diff --git a/page.php b/page.php
index fcb65fc..64c07b2 100644
--- a/page.php
+++ b/page.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The template for displaying all pages.
+ * The template for displaying all pages
  *
  * This is the template that displays all pages by default.
  * Please note that this is the WordPress construct of pages
diff --git a/readme.txt b/readme.txt
index 36c58fa..444aa5a 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,10 +1,10 @@
 === DevriX Starter ===
 
-Contributors: automattic
+Contributor: DevriX
 Tags: translation-ready, custom-background, theme-options, custom-menu, post-formats, threaded-comments
 
 Requires at least: 4.0
-Tested up to: 4.4.2
+Tested up to: 4.7.2
 Stable tag: 1.0.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -13,7 +13,7 @@ A starter theme called DevriX Starter, or underscores.
 
 == Description ==
 
-Hi. I'm a starter theme called DevriX Starter, or underscores, if you like. I'm a theme meant for hacking so don't use me as a Parent Theme. Instead try turning me into the next, most awesome, WordPress theme out there. That's what I'm here for.
+Hi. I'm a starter theme called DevriX Starter. I'm a theme meant for hacking so don't use me as a Parent Theme. Instead try turning me into the next, most awesome, WordPress theme out there. That's what I'm here for.
 
 == Installation ==
 
diff --git a/search.php b/search.php
index ceb09a7..df81eeb 100644
--- a/search.php
+++ b/search.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The template for displaying search results pages.
+ * The template for displaying search results pages
  *
  * @link https://developer.wordpress.org/themes/basics/template-hierarchy/#search-result
  *
diff --git a/sidebar.php b/sidebar.php
index c91846e..2620034 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The sidebar containing the main widget area.
+ * The sidebar containing the main widget area
  *
  * @link https://developer.wordpress.org/themes/basics/template-files/#template-partials
  *
diff --git a/single.php b/single.php
index 83272b8..1bc5a1c 100644
--- a/single.php
+++ b/single.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The template for displaying all single posts.
+ * The template for displaying all single posts
  *
  * @link https://developer.wordpress.org/themes/basics/template-hierarchy/#single-post
  *
diff --git a/snippets/section-faq-large.php b/snippets/section-faq-large.php
index 56951c6..608b24b 100644
--- a/snippets/section-faq-large.php
+++ b/snippets/section-faq-large.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Our basic FAQ layout.
+ * Our basic FAQ layout
  *
  * @since  DX Starter v1.3.0
  * @uses  assets/sass/prebuilds/elements/_section-faq-elements.scss
@@ -14,9 +14,9 @@
 				<header class="section-heading">
 					<h2 class="heading-title">This is the section's heading</h2><!-- .heading-title -->
 					<p class="heading-subtext">Under which you can even add parahraph with more text</p><!-- .heading-subtext -->
-				</header><!-- .flex-grid-wrapper -->
-			</div>
-		</div><!-- /end row -->
+				</header><!-- .section-heading -->
+			</div><!-- .columns -->
+		</div><!-- .row -->
 
 		<div class="row">
 			<!-- Note: For the faq elements there is .number element.
diff --git a/template-parts/content-none.php b/template-parts/content-none.php
index a40e2a1..8b9fd9c 100644
--- a/template-parts/content-none.php
+++ b/template-parts/content-none.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Template part for displaying a message that posts cannot be found.
+ * Template part for displaying a message that posts cannot be found
  *
  * @link https://codex.wordpress.org/Template_Hierarchy
  *
diff --git a/template-parts/content-page.php b/template-parts/content-page.php
index 2d86365..267002e 100644
--- a/template-parts/content-page.php
+++ b/template-parts/content-page.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Template part for displaying page content in page.php.
+ * Template part for displaying page content in page.php
  *
  * @link https://codex.wordpress.org/Template_Hierarchy
  *
diff --git a/template-parts/content-search.php b/template-parts/content-search.php
index b2a663d..f7a2ae1 100644
--- a/template-parts/content-search.php
+++ b/template-parts/content-search.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Template part for displaying results in search pages.
+ * Template part for displaying results in search pages
  *
  * @link https://codex.wordpress.org/Template_Hierarchy
  *
diff --git a/template-parts/content.php b/template-parts/content.php
index 7e809ad..607dec6 100644
--- a/template-parts/content.php
+++ b/template-parts/content.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Template part for displaying posts.
+ * Template part for displaying posts
  *
  * @link https://codex.wordpress.org/Template_Hierarchy
  *
diff --git a/templates/styleguide.php b/templates/styleguide.php
index 1d2afc7..dd17812 100644
--- a/templates/styleguide.php
+++ b/templates/styleguide.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Template Name: >> Theme Styleguide << 
  * 
