diff --git a/page-templates/page-full-width-image.php b/page-templates/page-full-width-image.php
index acaaf3e2..0ff1ca97 100644
--- a/page-templates/page-full-width-image.php
+++ b/page-templates/page-full-width-image.php
@@ -18,18 +18,18 @@
 
         <?php $thumb = wp_get_attachment_image_src(get_post_thumbnail_id($post->ID), 'full'); ?>
         <header class="entry-header featured-full-width-img height-75 bg-dark text-light mb-3" style="background-image: url('<?= $thumb['0']; ?>')">
-          <div class="<?php echo bootscore_container_class(); ?> entry-header h-100 d-flex align-items-end pb-3">
+          <div class="<?= bootscore_container_class(); ?> entry-header h-100 d-flex align-items-end pb-3">
             <h1 class="entry-title"><?php the_title(); ?></h1>
           </div>
         </header>
 
-        <div class="<?php echo bootscore_container_class(); ?> pb-5">
+        <div class="<?= bootscore_container_class(); ?> pb-5">
 
           <!-- Hook to add something nice -->
           <?php bs_after_primary(); ?>
 
           <div class="row">
-            <div class="<?php echo bootscore_main_col_class(); ?>">
+            <div class="<?= bootscore_main_col_class(); ?>">
 
               <div class="entry-content">
                 <?php the_content(); ?>
diff --git a/single-templates/single-full-width-image.php b/single-templates/single-full-width-image.php
index 77ebe7a8..f5040d92 100644
--- a/single-templates/single-full-width-image.php
+++ b/single-templates/single-full-width-image.php
@@ -14,13 +14,13 @@
 
         <?php the_post(); ?>
         <?php $thumb = wp_get_attachment_image_src(get_post_thumbnail_id($post->ID), 'full'); ?>
-        <header class="entry-header featured-full-width-img height-75 bg-dark text-light mb-3" style="background-image: url('<?php echo $thumb['0']; ?>')">
-          <div class="<?php echo bootscore_container_class(); ?> entry-header h-100 d-flex align-items-end pb-3">
+        <header class="entry-header featured-full-width-img height-75 bg-dark text-light mb-3" style="background-image: url('<?= $thumb['0']; ?>')">
+          <div class="<?= bootscore_container_class(); ?> entry-header h-100 d-flex align-items-end pb-3">
             <h1 class="entry-title"><?php the_title(); ?></h1>
           </div>
         </header>
 
-        <div class="<?php echo bootscore_container_class(); ?> pb-5">
+        <div class="<?= bootscore_container_class(); ?> pb-5">
 
           <!-- Hook to add something nice -->
           <?php bs_after_primary(); ?>
@@ -28,7 +28,7 @@
           <?php the_breadcrumb(); ?>
 
           <div class="row">
-            <div class="<?php echo bootscore_main_col_class(); ?>">
+            <div class="<?= bootscore_main_col_class(); ?>">
 
               <div class="entry-content">
                 <?php bootscore_category_badge(); ?>
diff --git a/single-templates/single-sidebar-left.php b/single-templates/single-sidebar-left.php
index c5d350c0..1d334dd6 100644
--- a/single-templates/single-sidebar-left.php
+++ b/single-templates/single-sidebar-left.php
@@ -7,7 +7,7 @@
 get_header();
 ?>
 
-  <div id="content" class="site-content <?php echo bootscore_container_class(); ?> py-5 mt-4">
+  <div id="content" class="site-content <?= bootscore_container_class(); ?> py-5 mt-4">
     <div id="primary" class="content-area">
 
       <!-- Hook to add something nice -->
@@ -17,7 +17,7 @@
 
       <div class="row">
         <?php get_sidebar(); ?>
-        <div class="<?php echo bootscore_main_col_class(); ?> order-first order-md-last">
+        <div class="<?= bootscore_main_col_class(); ?> order-first order-md-last">
 
           <main id="main" class="site-main">
 
diff --git a/single-templates/single-sidebar-none.php b/single-templates/single-sidebar-none.php
index 1d26df6c..73e12f4b 100644
--- a/single-templates/single-sidebar-none.php
+++ b/single-templates/single-sidebar-none.php
@@ -7,7 +7,7 @@
 get_header();
 ?>
 
-  <div id="content" class="site-content <?php echo bootscore_container_class(); ?> py-5 mt-4">
+  <div id="content" class="site-content <?= bootscore_container_class(); ?> py-5 mt-4">
     <div id="primary" class="content-area">
 
       <!-- Hook to add something nice -->