diff --git a/project/refactor.cpp b/project/refactor.cpp
index b1ab0db..90deca7 100644
--- a/project/refactor.cpp
+++ b/project/refactor.cpp
@@ -243,11 +243,13 @@ void refactor()
 			{
 				do
 				{
-					move_forward( 2 );
+					move_forward( 1 );
 				}
 				while ( (left - 2) > 0 && !( src[0] == '*' && src[1] == '/' ) );
 
-				move_forward( 2 );
+				move_forward( 1 );
+
+				goto Skip;
 			}
 		}
 
diff --git a/scripts/refactor_and_format.ps1 b/scripts/refactor_and_format.ps1
index 36b278e..515e3a4 100644
--- a/scripts/refactor_and_format.ps1
+++ b/scripts/refactor_and_format.ps1
@@ -18,6 +18,8 @@ write-host "Beginning refactor...`n"
 
 $refactors = @(@())
 
+# TODO: Change this to support refactoring the other files in the project directory.
+# It needs two runs, one for the regular files, one for the zpl header.
 foreach ( $file in $targetFiles )
 {
     $destination = Join-Path $path_test (Split-Path $file -leaf)