diff --git a/404.php b/404.php
index 6a12926..d0e4a93 100644
--- a/404.php
+++ b/404.php
@@ -86,4 +86,4 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 </div><!-- #error-404-wrapper -->
 
-<?php get_footer(); ?>
+<?php get_footer();
diff --git a/archive.php b/archive.php
index 6e3ba74..dafe34a 100644
--- a/archive.php
+++ b/archive.php
@@ -70,4 +70,4 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 	</div><!-- #archive-wrapper -->
 
-<?php get_footer(); ?>
+<?php get_footer();
diff --git a/author.php b/author.php
index a51dd26..0403acc 100644
--- a/author.php
+++ b/author.php
@@ -105,4 +105,4 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 </div><!-- #author-wrapper -->
 
-<?php get_footer(); ?>
+<?php get_footer();
diff --git a/global-templates/hero.php b/global-templates/hero.php
index a8fd655..cc47e21 100644
--- a/global-templates/hero.php
+++ b/global-templates/hero.php
@@ -21,4 +21,4 @@ defined( 'ABSPATH' ) || exit;
 
 	</div>
 
-<?php endif; ?>
+<?php endif;
diff --git a/global-templates/right-sidebar-check.php b/global-templates/right-sidebar-check.php
index fe61c5a..10b95ed 100644
--- a/global-templates/right-sidebar-check.php
+++ b/global-templates/right-sidebar-check.php
@@ -17,4 +17,4 @@ defined( 'ABSPATH' ) || exit;
 
 	<?php get_template_part( 'sidebar-templates/sidebar', 'right' ); ?>
 
-<?php endif; ?>
+<?php endif;
diff --git a/inc/pagination.php b/inc/pagination.php
index fadc462..f642361 100644
--- a/inc/pagination.php
+++ b/inc/pagination.php
@@ -55,4 +55,4 @@ if ( ! function_exists( 'understrap_pagination' ) ) {
 	}
 }
 
-?>
+
diff --git a/index.php b/index.php
index c5e4417..03750db 100644
--- a/index.php
+++ b/index.php
@@ -72,4 +72,4 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 </div><!-- #index-wrapper -->
 
-<?php get_footer(); ?>
+<?php get_footer();
diff --git a/page-templates/both-sidebarspage.php b/page-templates/both-sidebarspage.php
index 1338621..8a79321 100644
--- a/page-templates/both-sidebarspage.php
+++ b/page-templates/both-sidebarspage.php
@@ -57,4 +57,4 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 </div><!-- #page-wrapper -->
 
-<?php get_footer(); ?>
+<?php get_footer();
diff --git a/page-templates/fullwidthpage.php b/page-templates/fullwidthpage.php
index 05a4f0c..3582dee 100644
--- a/page-templates/fullwidthpage.php
+++ b/page-templates/fullwidthpage.php
@@ -52,4 +52,4 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 </div><!-- #full-width-page-wrapper -->
 
-<?php get_footer(); ?>
+<?php get_footer();
diff --git a/page-templates/left-sidebarpage.php b/page-templates/left-sidebarpage.php
index 1a76aee..24b1116 100644
--- a/page-templates/left-sidebarpage.php
+++ b/page-templates/left-sidebarpage.php
@@ -51,4 +51,4 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 </div><!-- #page-wrapper -->
 
-<?php get_footer(); ?>
+<?php get_footer();
diff --git a/page-templates/right-sidebarpage.php b/page-templates/right-sidebarpage.php
index 1dd58b1..ef98c92 100644
--- a/page-templates/right-sidebarpage.php
+++ b/page-templates/right-sidebarpage.php
@@ -51,4 +51,4 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 </div><!-- #page-wrapper -->
 
-<?php get_footer(); ?>
+<?php get_footer();
diff --git a/page.php b/page.php
index e9c1621..a957e04 100644
--- a/page.php
+++ b/page.php
@@ -54,4 +54,4 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 </div><!-- #page-wrapper -->
 
-<?php get_footer(); ?>
+<?php get_footer();
diff --git a/phpcs.xml b/phpcs.xml
index 3d04969..2ad51c7 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -74,7 +74,7 @@
 	</rule>
 
 	<!-- A closing tag is not permitted at the end of a PHP file -->
-	<!-- <rule ref="Zend.Files.ClosingTag"/> -->
+	<rule ref="Zend.Files.ClosingTag"/>
 
 	<!-- Use the PHPCompatibility Ruleset -->
 	<config name="testVersion" value="5.2-99.0"/>
diff --git a/search.php b/search.php
index 205b880..945d203 100644
--- a/search.php
+++ b/search.php
@@ -75,4 +75,4 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 </div><!-- #search-wrapper -->
 
-<?php get_footer(); ?>
+<?php get_footer();
diff --git a/sidebar-templates/sidebar-footerfull.php b/sidebar-templates/sidebar-footerfull.php
index a807e43..1d96090 100644
--- a/sidebar-templates/sidebar-footerfull.php
+++ b/sidebar-templates/sidebar-footerfull.php
@@ -30,4 +30,4 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 	</div><!-- #wrapper-footer-full -->
 
-<?php endif; ?>
+<?php endif;
diff --git a/sidebar-templates/sidebar-hero.php b/sidebar-templates/sidebar-hero.php
index b18c9fa..84edb95 100644
--- a/sidebar-templates/sidebar-hero.php
+++ b/sidebar-templates/sidebar-hero.php
@@ -43,4 +43,4 @@ defined( 'ABSPATH' ) || exit;
 	jQuery( ".carousel-item" ).first().addClass( "active" );
 	</script>
 
-<?php endif; ?>
+<?php endif;
diff --git a/sidebar-templates/sidebar-herocanvas.php b/sidebar-templates/sidebar-herocanvas.php
index 4a62a72..2d00036 100644
--- a/sidebar-templates/sidebar-herocanvas.php
+++ b/sidebar-templates/sidebar-herocanvas.php
@@ -15,4 +15,4 @@ defined( 'ABSPATH' ) || exit;
 
 	<?php dynamic_sidebar( 'herocanvas' ); ?>
 
-<?php endif; ?>
+<?php endif;
diff --git a/sidebar-templates/sidebar-statichero.php b/sidebar-templates/sidebar-statichero.php
index d5c3afe..75f5c83 100644
--- a/sidebar-templates/sidebar-statichero.php
+++ b/sidebar-templates/sidebar-statichero.php
@@ -29,4 +29,4 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 	</div><!-- #wrapper-static-hero -->
 
-<?php endif; ?>
+<?php endif;
diff --git a/single.php b/single.php
index 042c25a..2453849 100644
--- a/single.php
+++ b/single.php
@@ -49,4 +49,4 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 </div><!-- #single-wrapper -->
 
-<?php get_footer(); ?>
+<?php get_footer();
diff --git a/woocommerce/cart/cart-empty.php b/woocommerce/cart/cart-empty.php
index ca6c9c5..2f98d2e 100644
--- a/woocommerce/cart/cart-empty.php
+++ b/woocommerce/cart/cart-empty.php
@@ -28,4 +28,4 @@ if ( wc_get_page_id( 'shop' ) > 0 ) : ?>
 			<?php esc_html_e( 'Return to shop', 'understrap' ); ?>
 		</a>
 	</p>
-<?php endif; ?>
+<?php endif;
diff --git a/woocommerce/cart/cart.php b/woocommerce/cart/cart.php
index eeb677c..0d0b5d6 100644
--- a/woocommerce/cart/cart.php
+++ b/woocommerce/cart/cart.php
@@ -164,4 +164,4 @@ do_action( 'woocommerce_before_cart' ); ?>
 	?>
 </div>
 
-<?php do_action( 'woocommerce_after_cart' ); ?>
+<?php do_action( 'woocommerce_after_cart' );
diff --git a/woocommerce/cart/mini-cart.php b/woocommerce/cart/mini-cart.php
index 4ba9451..3b58593 100644
--- a/woocommerce/cart/mini-cart.php
+++ b/woocommerce/cart/mini-cart.php
@@ -83,4 +83,4 @@ do_action( 'woocommerce_before_mini_cart' ); ?>
 
 <?php endif; ?>
 
-<?php do_action( 'woocommerce_after_mini_cart' ); ?>
+<?php do_action( 'woocommerce_after_mini_cart' );
diff --git a/woocommerce/checkout/form-checkout.php b/woocommerce/checkout/form-checkout.php
index 50d78b5..15beffb 100644
--- a/woocommerce/checkout/form-checkout.php
+++ b/woocommerce/checkout/form-checkout.php
@@ -61,4 +61,4 @@ if ( ! $checkout->is_registration_enabled() && $checkout->is_registration_requir
 
 </form>
 
-<?php do_action( 'woocommerce_after_checkout_form', $checkout ); ?>
+<?php do_action( 'woocommerce_after_checkout_form', $checkout );
diff --git a/woocommerce/myaccount/downloads.php b/woocommerce/myaccount/downloads.php
index add3e2a..0feac83 100644
--- a/woocommerce/myaccount/downloads.php
+++ b/woocommerce/myaccount/downloads.php
@@ -44,4 +44,4 @@ do_action( 'woocommerce_before_account_downloads', $has_downloads ); ?>
 	</div>
 <?php endif; ?>
 
-<?php do_action( 'woocommerce_after_account_downloads', $has_downloads ); ?>
+<?php do_action( 'woocommerce_after_account_downloads', $has_downloads );
diff --git a/woocommerce/myaccount/form-edit-account.php b/woocommerce/myaccount/form-edit-account.php
index 1f326b0..9404478 100644
--- a/woocommerce/myaccount/form-edit-account.php
+++ b/woocommerce/myaccount/form-edit-account.php
@@ -73,4 +73,4 @@ do_action( 'woocommerce_before_edit_account_form' ); ?>
 	<?php do_action( 'woocommerce_edit_account_form_end' ); ?>
 </form>
 
-<?php do_action( 'woocommerce_after_edit_account_form' ); ?>
+<?php do_action( 'woocommerce_after_edit_account_form' );
diff --git a/woocommerce/myaccount/form-edit-address.php b/woocommerce/myaccount/form-edit-address.php
index 30f0f2e..3591e87 100644
--- a/woocommerce/myaccount/form-edit-address.php
+++ b/woocommerce/myaccount/form-edit-address.php
@@ -53,4 +53,4 @@ do_action( 'woocommerce_before_edit_account_address_form' ); ?>
 
 <?php endif; ?>
 
-<?php do_action( 'woocommerce_after_edit_account_address_form' ); ?>
+<?php do_action( 'woocommerce_after_edit_account_address_form' );
diff --git a/woocommerce/myaccount/form-login.php b/woocommerce/myaccount/form-login.php
index 8bcb2f8..b35c060 100644
--- a/woocommerce/myaccount/form-login.php
+++ b/woocommerce/myaccount/form-login.php
@@ -117,4 +117,4 @@ do_action( 'woocommerce_before_customer_login_form' ); ?>
 </div>
 <?php endif; ?>
 
-<?php do_action( 'woocommerce_after_customer_login_form' ); ?>
+<?php do_action( 'woocommerce_after_customer_login_form' );
diff --git a/woocommerce/myaccount/my-orders.php b/woocommerce/myaccount/my-orders.php
index b9660ec..c5f47d1 100644
--- a/woocommerce/myaccount/my-orders.php
+++ b/woocommerce/myaccount/my-orders.php
@@ -84,4 +84,4 @@ if ( $customer_orders ) : ?>
 			<?php endforeach; ?>
 		</tbody>
 	</table>
-<?php endif; ?>
+<?php endif;
diff --git a/woocommerce/myaccount/navigation.php b/woocommerce/myaccount/navigation.php
index b71f633..43695af 100644
--- a/woocommerce/myaccount/navigation.php
+++ b/woocommerce/myaccount/navigation.php
@@ -32,4 +32,4 @@ do_action( 'woocommerce_before_account_navigation' );
 	</div>
 </nav>
 
-<?php do_action( 'woocommerce_after_account_navigation' ); ?>
+<?php do_action( 'woocommerce_after_account_navigation' );
diff --git a/woocommerce/myaccount/orders.php b/woocommerce/myaccount/orders.php
index d22db40..c3840f2 100644
--- a/woocommerce/myaccount/orders.php
+++ b/woocommerce/myaccount/orders.php
@@ -104,4 +104,4 @@ do_action( 'woocommerce_before_account_orders', $has_orders ); ?>
 	</div>
 <?php endif; ?>
 
-<?php do_action( 'woocommerce_after_account_orders', $has_orders ); ?>
+<?php do_action( 'woocommerce_after_account_orders', $has_orders );
diff --git a/woocommerce/single-product/add-to-cart/simple.php b/woocommerce/single-product/add-to-cart/simple.php
index 6964e99..0e8668d 100644
--- a/woocommerce/single-product/add-to-cart/simple.php
+++ b/woocommerce/single-product/add-to-cart/simple.php
@@ -51,4 +51,4 @@ if ( $product->is_in_stock() ) : ?>
 
 	<?php do_action( 'woocommerce_after_add_to_cart_form' ); ?>
 
-<?php endif; ?>
+<?php endif;