diff --git a/templates/single-product/add-to-cart/external.php b/templates/single-product/add-to-cart/external.php
index 1636c3a2c81e9..12fc0c382b6c0 100644
--- a/templates/single-product/add-to-cart/external.php
+++ b/templates/single-product/add-to-cart/external.php
@@ -7,7 +7,10 @@
  * @version     2.1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+
 ?>
 
 <?php do_action( 'woocommerce_before_add_to_cart_button' ); ?>
@@ -16,4 +19,4 @@
 	<a href="<?php echo esc_url( $product_url ); ?>" rel="nofollow" class="single_add_to_cart_button button alt"><?php echo $button_text; ?></a>
 </p>
 
-<?php do_action( 'woocommerce_after_add_to_cart_button' ); ?>
\ No newline at end of file
+<?php do_action( 'woocommerce_after_add_to_cart_button' ); ?>
diff --git a/templates/single-product/add-to-cart/grouped.php b/templates/single-product/add-to-cart/grouped.php
index f62b1e63fd56e..963d223aaa91a 100644
--- a/templates/single-product/add-to-cart/grouped.php
+++ b/templates/single-product/add-to-cart/grouped.php
@@ -7,7 +7,9 @@
  * @version     2.1.7
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 global $product, $post;
 
@@ -79,4 +81,4 @@
 	<?php endif; ?>
 </form>
 
-<?php do_action( 'woocommerce_after_add_to_cart_form' ); ?>
\ No newline at end of file
+<?php do_action( 'woocommerce_after_add_to_cart_form' ); ?>
diff --git a/templates/single-product/add-to-cart/simple.php b/templates/single-product/add-to-cart/simple.php
index 97c34117e59cf..d3b2ff46f6132 100644
--- a/templates/single-product/add-to-cart/simple.php
+++ b/templates/single-product/add-to-cart/simple.php
@@ -7,18 +7,23 @@
  * @version     2.1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 global $product;
 
-if ( ! $product->is_purchasable() ) return;
+if ( ! $product->is_purchasable() ) {
+	return;
+}
+
 ?>
 
 <?php
 	// Availability
 	$availability      = $product->get_availability();
 	$availability_html = empty( $availability['availability'] ) ? '' : '<p class="stock ' . esc_attr( $availability['class'] ) . '">' . esc_html( $availability['availability'] ) . '</p>';
-	
+
 	echo apply_filters( 'woocommerce_stock_html', $availability_html, $availability['availability'], $product );
 ?>
 
@@ -46,4 +51,4 @@
 
 	<?php do_action( 'woocommerce_after_add_to_cart_form' ); ?>
 
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
diff --git a/templates/single-product/add-to-cart/variable.php b/templates/single-product/add-to-cart/variable.php
index 7e3570afecda7..c673bc3b7a8ce 100644
--- a/templates/single-product/add-to-cart/variable.php
+++ b/templates/single-product/add-to-cart/variable.php
@@ -7,9 +7,12 @@
  * @version     2.1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 global $product, $post;
+
 ?>
 
 <?php do_action( 'woocommerce_before_add_to_cart_form' ); ?>
diff --git a/templates/single-product/meta.php b/templates/single-product/meta.php
index 6be8c43a56dc3..cac8bf11164d1 100644
--- a/templates/single-product/meta.php
+++ b/templates/single-product/meta.php
@@ -7,12 +7,15 @@
  * @version     1.6.4
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 global $post, $product;
 
 $cat_count = sizeof( get_the_terms( $post->ID, 'product_cat' ) );
 $tag_count = sizeof( get_the_terms( $post->ID, 'product_tag' ) );
+
 ?>
 <div class="product_meta">
 
@@ -30,4 +33,4 @@
 
 	<?php do_action( 'woocommerce_product_meta_end' ); ?>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/single-product/price.php b/templates/single-product/price.php
index 51a0485949e7c..5655f597200c9 100644
--- a/templates/single-product/price.php
+++ b/templates/single-product/price.php
@@ -12,6 +12,7 @@
 }
 
 global $product;
+
 ?>
 <div itemprop="offers" itemscope itemtype="http://schema.org/Offer">
 
@@ -21,4 +22,4 @@
 	<meta itemprop="priceCurrency" content="<?php echo get_woocommerce_currency(); ?>" />
 	<link itemprop="availability" href="http://schema.org/<?php echo $product->is_in_stock() ? 'InStock' : 'OutOfStock'; ?>" />
 
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/single-product/product-attributes.php b/templates/single-product/product-attributes.php
index da978fcf25d4e..0344f9dedd6be 100644
--- a/templates/single-product/product-attributes.php
+++ b/templates/single-product/product-attributes.php
@@ -18,6 +18,7 @@
 $attributes = $product->get_attributes();
 
 ob_start();
+
 ?>
 <table class="shop_attributes">
 
@@ -64,11 +65,11 @@
 			?></td>
 		</tr>
 	<?php endforeach; ?>
-	
+
 </table>
 <?php
 if ( $has_row ) {
 	echo ob_get_clean();
 } else {
 	ob_end_clean();
-}
\ No newline at end of file
+}
diff --git a/templates/single-product/product-image.php b/templates/single-product/product-image.php
index 6f7f602564100..79c7be7fa2d8b 100644
--- a/templates/single-product/product-image.php
+++ b/templates/single-product/product-image.php
@@ -7,7 +7,9 @@
  * @version     2.0.14
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 global $post, $woocommerce, $product;
 
diff --git a/templates/single-product/product-thumbnails.php b/templates/single-product/product-thumbnails.php
index f4d13134f3d10..abe551e7f27f8 100644
--- a/templates/single-product/product-thumbnails.php
+++ b/templates/single-product/product-thumbnails.php
@@ -7,7 +7,9 @@
  * @version     2.0.3
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 global $post, $product, $woocommerce;
 
@@ -46,4 +48,4 @@
 
 	?></div>
 	<?php
-}
\ No newline at end of file
+}
diff --git a/templates/single-product/rating.php b/templates/single-product/rating.php
index 85fb73a0e4773..76ef9c977e329 100644
--- a/templates/single-product/rating.php
+++ b/templates/single-product/rating.php
@@ -7,12 +7,15 @@
  * @version     2.1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 global $product;
 
-if ( get_option( 'woocommerce_enable_review_rating' ) === 'no' )
+if ( get_option( 'woocommerce_enable_review_rating' ) === 'no' ) {
 	return;
+}
 
 $count   = $product->get_rating_count();
 $average = $product->get_average_rating();
@@ -28,4 +31,4 @@
 		<a href="#reviews" class="woocommerce-review-link" rel="nofollow">(<?php printf( _n( '%s customer review', '%s customer reviews', $count, 'woocommerce' ), '<span itemprop="ratingCount" class="count">' . $count . '</span>' ); ?>)</a>
 	</div>
 
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
diff --git a/templates/single-product/related.php b/templates/single-product/related.php
index 0cf05398e36ea..1ad80e7f4b730 100644
--- a/templates/single-product/related.php
+++ b/templates/single-product/related.php
@@ -7,7 +7,9 @@
  * @version     1.6.4
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 global $product, $woocommerce_loop;
 
diff --git a/templates/single-product/review.php b/templates/single-product/review.php
index 510d8011c611e..5608ed3d8d7f2 100644
--- a/templates/single-product/review.php
+++ b/templates/single-product/review.php
@@ -9,9 +9,12 @@
  * @version     2.1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 $rating = intval( get_comment_meta( $comment->comment_ID, 'rating', true ) );
+
 ?>
 <li itemprop="reviews" itemscope itemtype="http://schema.org/Review" <?php comment_class(); ?> id="li-comment-<?php comment_ID() ?>">
 
diff --git a/templates/single-product/sale-flash.php b/templates/single-product/sale-flash.php
index 4bc8cb4a1e165..07bf12970c533 100644
--- a/templates/single-product/sale-flash.php
+++ b/templates/single-product/sale-flash.php
@@ -7,12 +7,15 @@
  * @version     1.6.4
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 global $post, $product;
+
 ?>
 <?php if ( $product->is_on_sale() ) : ?>
 
 	<?php echo apply_filters( 'woocommerce_sale_flash', '<span class="onsale">' . __( 'Sale!', 'woocommerce' ) . '</span>', $post, $product ); ?>
 
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
diff --git a/templates/single-product/share.php b/templates/single-product/share.php
index 069b86089034e..5d6cc1678c974 100644
--- a/templates/single-product/share.php
+++ b/templates/single-product/share.php
@@ -9,8 +9,10 @@
  * @version     1.6.4
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 ?>
 
-<?php do_action( 'woocommerce_share' ); // Sharing plugins can hook into here ?>
\ No newline at end of file
+<?php do_action( 'woocommerce_share' ); // Sharing plugins can hook into here ?>
diff --git a/templates/single-product/short-description.php b/templates/single-product/short-description.php
index 1e9bb9c63ea6f..397f9b548f977 100644
--- a/templates/single-product/short-description.php
+++ b/templates/single-product/short-description.php
@@ -7,12 +7,17 @@
  * @version     1.6.4
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 global $post;
 
-if ( ! $post->post_excerpt ) return;
+if ( ! $post->post_excerpt ) {
+	return;
+}
+
 ?>
 <div itemprop="description">
 	<?php echo apply_filters( 'woocommerce_short_description', $post->post_excerpt ) ?>
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/single-product/tabs/additional-information.php b/templates/single-product/tabs/additional-information.php
index 24ae89046cb24..7ba92a861656f 100644
--- a/templates/single-product/tabs/additional-information.php
+++ b/templates/single-product/tabs/additional-information.php
@@ -1,24 +1,24 @@
 <?php
 /**
  * Additional Information tab
- * 
+ *
  * @author        WooThemes
  * @package       WooCommerce/Templates
  * @version       2.0.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	// Exit if accessed directly
-	exit;
+	exit; // Exit if accessed directly
 }
 
 global $product;
 
 $heading = apply_filters( 'woocommerce_product_additional_information_heading', __( 'Additional Information', 'woocommerce' ) );
+
 ?>
 
 <?php if ( $heading ): ?>
 	<h2><?php echo $heading; ?></h2>
 <?php endif; ?>
 
-<?php $product->list_attributes(); ?>
\ No newline at end of file
+<?php $product->list_attributes(); ?>
diff --git a/templates/single-product/tabs/description.php b/templates/single-product/tabs/description.php
index 69b163dec4d42..4df93804d6b09 100644
--- a/templates/single-product/tabs/description.php
+++ b/templates/single-product/tabs/description.php
@@ -7,11 +7,14 @@
  * @version     2.0.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 global $post;
 
 $heading = esc_html( apply_filters( 'woocommerce_product_description_heading', __( 'Product Description', 'woocommerce' ) ) );
+
 ?>
 
 <?php if ( $heading ): ?>
diff --git a/templates/single-product/tabs/tabs.php b/templates/single-product/tabs/tabs.php
index 9c42da10212f3..3068f96878436 100644
--- a/templates/single-product/tabs/tabs.php
+++ b/templates/single-product/tabs/tabs.php
@@ -7,7 +7,9 @@
  * @version     2.0.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 /**
  * Filter tabs and allow third parties to add their own
@@ -38,4 +40,4 @@
 		<?php endforeach; ?>
 	</div>
 
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
diff --git a/templates/single-product/title.php b/templates/single-product/title.php
index 90e50281dbe84..82346e0be860b 100644
--- a/templates/single-product/title.php
+++ b/templates/single-product/title.php
@@ -7,7 +7,9 @@
  * @version     1.6.4
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 ?>
-<h1 itemprop="name" class="product_title entry-title"><?php the_title(); ?></h1>
\ No newline at end of file
+<h1 itemprop="name" class="product_title entry-title"><?php the_title(); ?></h1>
diff --git a/templates/single-product/up-sells.php b/templates/single-product/up-sells.php
index b69db7c49db9a..39753269e2f3e 100644
--- a/templates/single-product/up-sells.php
+++ b/templates/single-product/up-sells.php
@@ -7,13 +7,17 @@
  * @version     1.6.4
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 global $product, $woocommerce_loop;
 
 $upsells = $product->get_upsells();
 
-if ( sizeof( $upsells ) == 0 ) return;
+if ( sizeof( $upsells ) == 0 ) {
+	return;
+}
 
 $meta_query = WC()->query->get_meta_query();