diff --git a/plugin-boilerplate/class-plugin-boilerplate.php b/plugin-boilerplate/class-plugin-boilerplate.php
index ce51257..9754348 100644
--- a/plugin-boilerplate/class-plugin-boilerplate.php
+++ b/plugin-boilerplate/class-plugin-boilerplate.php
@@ -1,4 +1,9 @@
 <?php
+// If this file is called directly, abort.
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
 /**
  * The WordPress Plugin Boilerplate.
  *
@@ -14,34 +19,6 @@
  * @link    TODO
  * @version 1.0.0
  */
-
-/**
- * If this file is attempted to be accessed directly, we'll exit.
- *
- * The following check provides a level of security from other files
- * that request data directly.
- */
-if ( ! defined( 'ABSPATH' ) ) {
-	exit;
-}
-
-/*
- * The following constant is used to define a constant for this plugin to make it
- * easier to provide cache-busting functionality on loading stylesheets
- * and JavaScript.
- *
- * After you've defined these constants, do a find/replace on the constants
- * used throughout the rest of this file.
- */
-// TODO: Replace 'PLUGIN_NAME' wih the name of your class
-if ( ! defined( 'PLUGIN_NAME_VERSION' ) ) {
-
-	// TODO: Make sure that this version correspondings to the value in the 'Version' in the header
-	define( 'PLUGIN_NAME_VERSION', '1.0.0' );
-
-}
-
-// TODO: Rename this class to a proper name for your plugin.
 class PluginName {
 
 	/**
diff --git a/plugin-boilerplate/plugin-boilerplate.php b/plugin-boilerplate/plugin-boilerplate.php
index 707e54d..e1374f9 100644
--- a/plugin-boilerplate/plugin-boilerplate.php
+++ b/plugin-boilerplate/plugin-boilerplate.php
@@ -9,7 +9,6 @@
  * @author  Your Name <email@example.com>
  * @license GPL-2.0+
  * @link    TODO
- * @version 1.0.0
  *
  * @wordpress-plugin
  * Plugin Name: TODO
@@ -25,16 +24,27 @@
  * Domain Path: /lang/
  */
 
-/**
- * If this file is attempted to be accessed directly, we'll exit.
- *
- * The following check provides a level of security from other files
- * that request data directly.
- */
+// If this file is called directly, abort.
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
+/*
+ * The following constant is used to define a constant for this plugin to make it
+ * easier to provide cache-busting functionality on loading stylesheets
+ * and JavaScript.
+ *
+ * After you've defined these constants, do a find/replace on the constants
+ * used throughout the rest of this file.
+ */
+// TODO: Replace 'PLUGIN_NAME' wih the name of your class
+if ( ! defined( 'PLUGIN_NAME_VERSION' ) ) {
+
+	// TODO: Make sure that this version correspondings to the value in the 'Version' in the header
+	define( 'PLUGIN_NAME_VERSION', '1.0.0' );
+
+}
+
 // TODO: replace `class-plugin-boilerplate.php` with the name of the actual plugin's class file
 require_once( plugin_dir_path( __FILE__ ) . 'class-plugin-boilerplate.php' );