diff --git a/Advanced Software Engineering/Advanced Software Engineering/Commander.cs b/Advanced Software Engineering/Advanced Software Engineering/Commander.cs
index 19901a9..31f3582 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Commander.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Commander.cs	
@@ -84,11 +84,17 @@ namespace Advanced_Software_Engineering {
             int lineNumber = 0;
             bool failed = false;
             foreach (string rawCommand in commands) {
+                string fullCommand = rawCommand;
                 lineNumber++;
-                if (rawCommand == "") continue;
+                //Remove comments
+                if (fullCommand.Contains("@")) {
+                    fullCommand = fullCommand.Substring(0, fullCommand.IndexOf("@"));
+                }
+
+                if (fullCommand == "") continue;
 
                 try {
-                    AddCommand(VerbFactory.MakeVerb(drawer, rawCommand));
+                    AddCommand(VerbFactory.MakeVerb(drawer, fullCommand));
                     Console.WriteLine(rawCommand);
                 } catch (Exception e) {
                     Console.WriteLine("Error!");
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs
index 0b00f3c..8ebafdf 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs	
@@ -24,14 +24,6 @@ namespace Advanced_Software_Engineering {
         /// <param name="fullCommand">The command as a string</param>
         /// <returns>A IVerb that maches the command</returns>
         public static IVerb MakeVerb(Drawer drawer, string fullCommand) {
-            //Remove comments
-            string tmp = "";
-            foreach(char character in fullCommand) {
-                if (character == "@"[0]) break;
-                tmp += character;
-            }
-            fullCommand = tmp;
-
             ValueStorage rootValueStorage = drawer.GetValueStorage();
 
             List<VerbChunk> verbChunks = drawer.verbChunks;