diff --git a/includes/admin/importers/class-sp-event-importer.php b/includes/admin/importers/class-sp-event-importer.php
index 15a4bccc..caeb6193 100644
--- a/includes/admin/importers/class-sp-event-importer.php
+++ b/includes/admin/importers/class-sp-event-importer.php
@@ -359,7 +359,7 @@ if ( class_exists( 'WP_Importer' ) ) {
 				else:
 
 					echo '<p><strong>' . __( 'Sorry, there has been an error.', 'sportspress' ) . '</strong><br />';
-					echo __( 'The CSV is invalid.', 'sportspress' ) . '</p>';
+					_e( 'The CSV is invalid.', 'sportspress' ) . '</p>';
 					$this->footer();
 					die();
 
diff --git a/includes/admin/importers/class-sp-player-importer.php b/includes/admin/importers/class-sp-player-importer.php
index cb4d24fc..eefeb1cf 100644
--- a/includes/admin/importers/class-sp-player-importer.php
+++ b/includes/admin/importers/class-sp-player-importer.php
@@ -126,7 +126,7 @@ if ( class_exists( 'WP_Importer' ) ) {
 				else:
 
 					echo '<p><strong>' . __( 'Sorry, there has been an error.', 'sportspress' ) . '</strong><br />';
-					echo __( 'The CSV is invalid.', 'sportspress' ) . '</p>';
+					_e( 'The CSV is invalid.', 'sportspress' ) . '</p>';
 					$this->footer();
 					die();
 
diff --git a/includes/admin/importers/class-sp-staff-importer.php b/includes/admin/importers/class-sp-staff-importer.php
index a0298a6d..e90f8d18 100644
--- a/includes/admin/importers/class-sp-staff-importer.php
+++ b/includes/admin/importers/class-sp-staff-importer.php
@@ -119,7 +119,7 @@ if ( class_exists( 'WP_Importer' ) ) {
 				else:
 
 					echo '<p><strong>' . __( 'Sorry, there has been an error.', 'sportspress' ) . '</strong><br />';
-					echo __( 'The CSV is invalid.', 'sportspress' ) . '</p>';
+					_e( 'The CSV is invalid.', 'sportspress' ) . '</p>';
 					$this->footer();
 					die();
 
diff --git a/includes/admin/importers/class-sp-team-importer.php b/includes/admin/importers/class-sp-team-importer.php
index d447c0cc..e5511f74 100644
--- a/includes/admin/importers/class-sp-team-importer.php
+++ b/includes/admin/importers/class-sp-team-importer.php
@@ -83,7 +83,7 @@ if ( class_exists( 'WP_Importer' ) ) {
 				else:
 
 					echo '<p><strong>' . __( 'Sorry, there has been an error.', 'sportspress' ) . '</strong><br />';
-					echo __( 'The CSV is invalid.', 'sportspress' ) . '</p>';
+					_e( 'The CSV is invalid.', 'sportspress' ) . '</p>';
 					$this->footer();
 					die();
 
diff --git a/includes/admin/views/html-admin-page-status.php b/includes/admin/views/html-admin-page-status.php
index e40ed9e6..ae03ddf2 100644
--- a/includes/admin/views/html-admin-page-status.php
+++ b/includes/admin/views/html-admin-page-status.php
@@ -34,7 +34,7 @@
 		</tr>
 		<tr>
 			<td><?php _e( 'WP Multisite Enabled','sportspress' ); ?>:</td>
-			<td><?php if ( is_multisite() ) echo __( 'Yes', 'sportspress' ); else echo __( 'No', 'sportspress' ); ?></td>
+			<td><?php if ( is_multisite() ) _e( 'Yes', 'sportspress' ); else _e( 'No', 'sportspress' ); ?></td>
 		</tr>
 		<tr>
 			<td><?php _e( 'Web Server Info','sportspress' ); ?>:</td>
diff --git a/includes/class-sp-install.php b/includes/class-sp-install.php
index 173f6a25..ded817b3 100644
--- a/includes/class-sp-install.php
+++ b/includes/class-sp-install.php
@@ -531,7 +531,7 @@ class SP_Install {
 			if ( preg_match( $regexp, $response['body'], $matches ) ) {
 				$changelog = (array) preg_split( '~[\r\n]+~', trim( $matches[2] ) );
 
-				echo __( 'What\'s new:', 'sportspress' ) . '<div style="font-weight: normal;">';
+				_e( 'What\'s new:', 'sportspress' ) . '<div style="font-weight: normal;">';
 
 				$ul = false;
 
diff --git a/templates/countdown.php b/templates/countdown.php
index fac97e9a..9e9ac084 100644
--- a/templates/countdown.php
+++ b/templates/countdown.php
@@ -61,9 +61,9 @@ if ( ! isset( $post ) ) return;
 	$s = $interval->invert ? 0 : $interval->s;
 	?>
 	<p class="countdown sp-countdown<?php if ( $days >= 10 ): ?> long-countdown<?php endif; ?>"><time datetime="<?php echo $post->post_date; ?>"<?php if ( $live ): ?> data-countdown="<?php echo str_replace( '-', '/', $post->post_date ); ?>"<?php endif; ?>>
-		<span><?php echo sprintf( '%02s', $days ); ?> <small><?php echo __( 'days', 'sportspress' ); ?></small></span>
-		<span><?php echo sprintf( '%02s', $h ); ?> <small><?php echo __( 'hrs', 'sportspress' ); ?></small></span>
-		<span><?php echo sprintf( '%02s', $i ); ?> <small><?php echo __( 'mins', 'sportspress' ); ?></small></span>
-		<span><?php echo sprintf( '%02s', $s ); ?> <small><?php echo __( 'secs', 'sportspress' ); ?></small></span>
+		<span><?php echo sprintf( '%02s', $days ); ?> <small><?php _e( 'days', 'sportspress' ); ?></small></span>
+		<span><?php echo sprintf( '%02s', $h ); ?> <small><?php _e( 'hrs', 'sportspress' ); ?></small></span>
+		<span><?php echo sprintf( '%02s', $i ); ?> <small><?php _e( 'mins', 'sportspress' ); ?></small></span>
+		<span><?php echo sprintf( '%02s', $s ); ?> <small><?php _e( 'secs', 'sportspress' ); ?></small></span>
 	</time></p>
 </div>
diff --git a/templates/event-details.php b/templates/event-details.php
index 3efe4783..95e98926 100644
--- a/templates/event-details.php
+++ b/templates/event-details.php
@@ -29,7 +29,7 @@ if ( $seasons ):
 	$data[ __( 'Season', 'sportspress' ) ] = $season->name;
 endif;
 ?>
-<h3><?php echo __( 'Details', 'sportspress' ); ?></h3>
+<h3><?php _e( 'Details', 'sportspress' ); ?></h3>
 <div class="sp-table-wrapper sp-scrollable-table-wrapper">
 	<table class="sp-event-details sp-data-table">
 		<thead>
diff --git a/templates/event-list.php b/templates/event-list.php
index 50afcb94..02bde70f 100644
--- a/templates/event-list.php
+++ b/templates/event-list.php
@@ -163,9 +163,9 @@ if ( isset( $columns ) )
 						endif;
 						if ( $event->post_content !== null ):
 							if ( $event->post_status == 'publish' ):
-								echo __( 'Recap', 'sportspress' );
+								_e( 'Recap', 'sportspress' );
 							else:
-								echo __( 'Preview', 'sportspress' );
+								_e( 'Preview', 'sportspress' );
 							endif;
 						endif;
 
diff --git a/templates/player-list.php b/templates/player-list.php
index 33d1247a..bc6ff781 100644
--- a/templates/player-list.php
+++ b/templates/player-list.php
@@ -38,7 +38,6 @@ if ( isset( $columns ) && null !== $columns ):
 endif;
 $data = $list->data();
 
-
 // The first row should be column labels
 $labels = $data[0];