diff --git a/plugin-name/trunk/admin/class-plugin-name-admin-loader.php b/plugin-name/trunk/admin/class-plugin-name-admin-loader.php
index a259ded..ccc007e 100644
--- a/plugin-name/trunk/admin/class-plugin-name-admin-loader.php
+++ b/plugin-name/trunk/admin/class-plugin-name-admin-loader.php
@@ -1,7 +1,6 @@
 <?php
 
 /**
- * @TODO
  * Define a short description for what this class does.
  *
  * @since   x.x.x
@@ -9,7 +8,6 @@
  */
 
 /**
- * @TODO
  * Define a short description for what this class does.
  *
  * Define a longer description for the purpose of this class.
@@ -23,7 +21,6 @@
 class Plugin_Name_Admin_Loader {
 
 	/**
-	 * @TODO
 	 * Short description. (use period)
 	 *
 	 * Long description.
@@ -35,8 +32,6 @@ class Plugin_Name_Admin_Loader {
 	public function run( $plugin_name_admin ) {
 
 		/**
-		 * @TODO
-		 *
 		 * This function is used to define the various hooks that are used in the
 		 * dashboard-specific side of the plugin. This is achieved via dependency injection
 		 * by passing an instance of Plugin_Name_Admin into this class.
diff --git a/plugin-name/trunk/admin/class-plugin-name-admin.php b/plugin-name/trunk/admin/class-plugin-name-admin.php
index 65d0434..95a5cce 100644
--- a/plugin-name/trunk/admin/class-plugin-name-admin.php
+++ b/plugin-name/trunk/admin/class-plugin-name-admin.php
@@ -1,7 +1,6 @@
 <?php
 
 /**
- * @TODO
  * Define a short description for what this class does.
  *
  * @since   x.x.x
@@ -9,7 +8,6 @@
  */
 
 /**
- * @TODO
  * Define a short description for what this class does.
  *
  * Define a longer description for the purpose of this class.
@@ -23,7 +21,6 @@
 class Plugin_Name_Admin {
 
 	/**
-	 * @TODO
 	 * Short description. (use period)
 	 *
 	 * Long description.
@@ -49,7 +46,6 @@ class Plugin_Name_Admin {
 	}
 
 	/**
-	 * @TODO
 	 * Short description. (use period)
 	 *
 	 * Long description.
diff --git a/plugin-name/trunk/admin/css/plugin-name-admin.css b/plugin-name/trunk/admin/css/plugin-name-admin.css
index 07b2ecc..b3266b8 100644
--- a/plugin-name/trunk/admin/css/plugin-name-admin.css
+++ b/plugin-name/trunk/admin/css/plugin-name-admin.css
@@ -1,6 +1,4 @@
 /**
- * @TODO
- *
  * All of the CSS for your Dashboard-specific functionality should be
  * included in this file.
  */
\ No newline at end of file
diff --git a/plugin-name/trunk/admin/js/plugin-name-admin.js b/plugin-name/trunk/admin/js/plugin-name-admin.js
index b7e0a7f..457a65f 100644
--- a/plugin-name/trunk/admin/js/plugin-name-admin.js
+++ b/plugin-name/trunk/admin/js/plugin-name-admin.js
@@ -2,8 +2,6 @@
 	'use strict';
 
 	/**
-	 * @TODO
-	 *
 	 * All of the code for your Dashboard-specific JavaScript source
 	 * should reside in this file.
 	 *
diff --git a/plugin-name/trunk/admin/partials/plugin-name-admin-display.php b/plugin-name/trunk/admin/partials/plugin-name-admin-display.php
index 314fb2a..dafd059 100644
--- a/plugin-name/trunk/admin/partials/plugin-name-admin-display.php
+++ b/plugin-name/trunk/admin/partials/plugin-name-admin-display.php
@@ -1,6 +1,6 @@
 <?php
+
 /**
- * @TODO
  * Define a short description for what this file does.
  *
  * @since   x.x.x
@@ -8,7 +8,6 @@
  */
 
 /**
- * @TODO
  * Define a short description for what this file does.
  *
  * Define a longer description for the purpose of this file.
diff --git a/plugin-name/trunk/includes/class-plugin-name-activator.php b/plugin-name/trunk/includes/class-plugin-name-activator.php
index e3080de..91e77bf 100644
--- a/plugin-name/trunk/includes/class-plugin-name-activator.php
+++ b/plugin-name/trunk/includes/class-plugin-name-activator.php
@@ -1,7 +1,6 @@
 <?php
 
 /**
- * @TODO
  * Short description (no period for file headers)
  *
  * Long description.
@@ -11,7 +10,6 @@
  */
 
 /**
- * @TODO
  * Short description (no period for file headers)
  *
  * Long description.
@@ -25,7 +23,6 @@
 class Plugin_Name_Activator {
 
 	/**
-	 * @TODO
 	 * Short description. (use period)
 	 *
 	 * Long description.
diff --git a/plugin-name/trunk/includes/class-plugin-name-deactivator.php b/plugin-name/trunk/includes/class-plugin-name-deactivator.php
index 48d675a..3c0abef 100644
--- a/plugin-name/trunk/includes/class-plugin-name-deactivator.php
+++ b/plugin-name/trunk/includes/class-plugin-name-deactivator.php
@@ -1,7 +1,6 @@
 <?php
 
 /**
- * @TODO
  * Short description (no period for file headers)
  *
  * Long description.
@@ -11,7 +10,6 @@
  */
 
 /**
- * @TODO
  * Short description (no period for file headers)
  *
  * Long description.
@@ -25,7 +23,6 @@
 class Plugin_Name_Deactivator {
 
 	/**
-	 * @TODO
 	 * Short description. (use period)
 	 *
 	 * Long description.
diff --git a/plugin-name/trunk/includes/class-plugin-name.php b/plugin-name/trunk/includes/class-plugin-name.php
index 951a482..d53a4ec 100644
--- a/plugin-name/trunk/includes/class-plugin-name.php
+++ b/plugin-name/trunk/includes/class-plugin-name.php
@@ -1,7 +1,6 @@
 <?php
 
 /**
- * @TODO
  * Short description (no period for file headers)
  *
  * Long description.
@@ -11,7 +10,6 @@
  */
 
 /**
- * @TODO
  * Short description (no period for file headers)
  *
  * Long description.
diff --git a/plugin-name/trunk/plugin-name.php b/plugin-name/trunk/plugin-name.php
index 65d1924..ef545d7 100644
--- a/plugin-name/trunk/plugin-name.php
+++ b/plugin-name/trunk/plugin-name.php
@@ -1,8 +1,6 @@
 <?php
 
 /**
- * @TODO
- *
  * Short Description (no period for file headers)
  *
  * Long Description.
diff --git a/plugin-name/trunk/public/class-plugin-name-public-loader.php b/plugin-name/trunk/public/class-plugin-name-public-loader.php
index 3da631b..c726a35 100644
--- a/plugin-name/trunk/public/class-plugin-name-public-loader.php
+++ b/plugin-name/trunk/public/class-plugin-name-public-loader.php
@@ -1,7 +1,6 @@
 <?php
 
 /**
- * @TODO
  * Define a short description for what this class does.
  *
  * @since   x.x.x
@@ -9,7 +8,6 @@
  */
 
 /**
- * @TODO
  * Define a short description for what this class does.
  *
  * Define a longer description for the purpose of this class.
@@ -23,7 +21,6 @@
 class Plugin_Name_Public_Loader {
 
 	/**
-	 * @TODO
 	 * Short description. (use period)
 	 *
 	 * Long description.
@@ -35,8 +32,6 @@ class Plugin_Name_Public_Loader {
 	public function run( $plugin_name_public ) {
 
 		/**
-		 * @TODO
-		 *
 		 * This function is used to define the various hooks that are used in the
 		 * public-facing side of the plugin. This is achieved via dependency injection
 		 * by passing an instance of Plugin_Name_Public into this class.
diff --git a/plugin-name/trunk/public/class-plugin-name-public.php b/plugin-name/trunk/public/class-plugin-name-public.php
index 95dc67f..8ce6eb2 100644
--- a/plugin-name/trunk/public/class-plugin-name-public.php
+++ b/plugin-name/trunk/public/class-plugin-name-public.php
@@ -1,7 +1,6 @@
 <?php
 
 /**
- * @TODO
  * Define a short description for what this class does.
  *
  * @since   x.x.x
@@ -9,7 +8,6 @@
  */
 
 /**
- * @TODO
  * Define a short description for what this class does.
  *
  * Define a longer description for the purpose of this class.
@@ -23,7 +21,6 @@
 class Plugin_Name_Public {
 
 	/**
-	 * @TODO
 	 * Short description. (use period)
 	 *
 	 * Long description.
diff --git a/plugin-name/trunk/public/css/plugin-name-public.css b/plugin-name/trunk/public/css/plugin-name-public.css
index e994f30..65bbf96 100644
--- a/plugin-name/trunk/public/css/plugin-name-public.css
+++ b/plugin-name/trunk/public/css/plugin-name-public.css
@@ -1,6 +1,4 @@
 /**
- * @TODO
- *
  * All of the CSS for your public-facing functionality should be
  * included in this file.
  */
\ No newline at end of file
diff --git a/plugin-name/trunk/public/js/plugin-name-public.js b/plugin-name/trunk/public/js/plugin-name-public.js
index d0346c4..9858cbe 100644
--- a/plugin-name/trunk/public/js/plugin-name-public.js
+++ b/plugin-name/trunk/public/js/plugin-name-public.js
@@ -2,8 +2,6 @@
 	'use strict';
 
 	/**
-	 * @TODO
-	 *
 	 * All of the code for your public-facing JavaScript source
 	 * should reside in this file.
 	 *
diff --git a/plugin-name/trunk/public/partials/plugin-name-public-display.php b/plugin-name/trunk/public/partials/plugin-name-public-display.php
index 97c3494..168baf1 100644
--- a/plugin-name/trunk/public/partials/plugin-name-public-display.php
+++ b/plugin-name/trunk/public/partials/plugin-name-public-display.php
@@ -1,6 +1,6 @@
 <?php
+
 /**
- * @TODO
  * Define a short description for what this file does.
  *
  * @since   x.x.x
@@ -8,7 +8,6 @@
  */
 
 /**
- * @TODO
  * Define a short description for what this file does.
  *
  * Define a longer description for the purpose of this file.
diff --git a/plugin-name/trunk/uninstall.php b/plugin-name/trunk/uninstall.php
index 3e60291..16ab9b1 100644
--- a/plugin-name/trunk/uninstall.php
+++ b/plugin-name/trunk/uninstall.php
@@ -1,6 +1,6 @@
 <?php
+
 /**
- * @TODO
  * Short Description (no period for file headers)
  *
  * Long Description.