diff --git a/PrinterCommunication.cs b/PrinterCommunication.cs
index 771105bb1..bd6329279 100644
--- a/PrinterCommunication.cs
+++ b/PrinterCommunication.cs
@@ -823,18 +823,18 @@ namespace MatterHackers.MatterControl
 
             string lineToParse = foundStringEventArgs.LineToCheck;
             Vector3 positionRead = Vector3.Zero;
-            GCodeFile.GetFirstNumberAfter("X:", lineToParse, ref positionRead.x);
-            GCodeFile.GetFirstNumberAfter("Y:", lineToParse, ref positionRead.y);
-            GCodeFile.GetFirstNumberAfter("Z:", lineToParse, ref positionRead.z);
+            GCodeFile.GetFirstNumberAfter('X', lineToParse, ref positionRead.x);
+            GCodeFile.GetFirstNumberAfter('Y', lineToParse, ref positionRead.y);
+            GCodeFile.GetFirstNumberAfter('Z', lineToParse, ref positionRead.z);
 
             int xPosition = lineToParse.IndexOf('X');
             int secondXPosition = lineToParse.IndexOf("Count", xPosition);
             if (secondXPosition != -1)
             {
                 Vector3 currentPositionRead = Vector3.Zero;
-                GCodeFile.GetFirstNumberAfter("X:", lineToParse, ref currentPositionRead.x, secondXPosition - 1);
-                GCodeFile.GetFirstNumberAfter("Y:", lineToParse, ref currentPositionRead.y, secondXPosition - 1);
-                GCodeFile.GetFirstNumberAfter("Z:", lineToParse, ref currentPositionRead.z, secondXPosition - 1);
+                GCodeFile.GetFirstNumberAfter('X', lineToParse, ref currentPositionRead.x, secondXPosition - 1);
+                GCodeFile.GetFirstNumberAfter('Y', lineToParse, ref currentPositionRead.y, secondXPosition - 1);
+                GCodeFile.GetFirstNumberAfter('Z', lineToParse, ref currentPositionRead.z, secondXPosition - 1);
 
                 lastReportedPosition = currentPositionRead;
             }
@@ -1289,9 +1289,9 @@ namespace MatterHackers.MatterControl
                     newDestination = Vector3.Zero;
                 }
 
-                GCodeFile.GetFirstNumberAfter("X", lineBeingSent, ref newDestination.x);
-                GCodeFile.GetFirstNumberAfter("Y", lineBeingSent, ref newDestination.y);
-                GCodeFile.GetFirstNumberAfter("Z", lineBeingSent, ref newDestination.z);
+                GCodeFile.GetFirstNumberAfter('X', lineBeingSent, ref newDestination.x);
+                GCodeFile.GetFirstNumberAfter('Y', lineBeingSent, ref newDestination.y);
+                GCodeFile.GetFirstNumberAfter('Z', lineBeingSent, ref newDestination.z);
 
                 if (movementMode == PrinterMachineInstruction.MovementTypes.Relative)
                 {
@@ -1318,7 +1318,7 @@ namespace MatterHackers.MatterControl
             lineBeingSent = lineBeingSent.ToUpper().Trim();
             if (lineBeingSent.StartsWith("G0") || lineBeingSent.StartsWith("G1"))
             {
-                if (GCodeFile.GetFirstNumberAfter("E", lineBeingSent, ref gcodeRequestedExtrusionPosition))
+                if (GCodeFile.GetFirstNumberAfter('E', lineBeingSent, ref gcodeRequestedExtrusionPosition))
                 {
                     double delta = gcodeRequestedExtrusionPosition - previousGcodeRequestedExtrusionPosition;
                     if (extruderMode == PrinterMachineInstruction.MovementTypes.Relative)
@@ -1333,7 +1333,7 @@ namespace MatterHackers.MatterControl
             }
             else if (lineBeingSent.StartsWith("G92"))
             {
-                if (GCodeFile.GetFirstNumberAfter("E", lineBeingSent, ref gcodeRequestedExtrusionPosition))
+                if (GCodeFile.GetFirstNumberAfter('E', lineBeingSent, ref gcodeRequestedExtrusionPosition))
                 {
                     previousGcodeRequestedExtrusionPosition = gcodeRequestedExtrusionPosition;
                     currentActualExtrusionPosition = gcodeRequestedExtrusionPosition;
@@ -1351,7 +1351,7 @@ namespace MatterHackers.MatterControl
                 if (lineBeingSent.StartsWith("G0") || lineBeingSent.StartsWith("G1"))
                 {
                     double feedRate = 0;
-                    if (GCodeFile.GetFirstNumberAfter("F", lineBeingSent, ref feedRate))
+                    if (GCodeFile.GetFirstNumberAfter('F', lineBeingSent, ref feedRate))
                     {
                         lineBeingSent = GCodeFile.ReplaceNumberAfter('F', lineBeingSent, feedRate * FeedRateRatio);
                     }
diff --git a/PrinterControls/PrintLeveling.cs b/PrinterControls/PrintLeveling.cs
index 1e118182b..5c7de53bb 100644
--- a/PrinterControls/PrintLeveling.cs
+++ b/PrinterControls/PrintLeveling.cs
@@ -85,9 +85,9 @@ namespace MatterHackers.MatterControl
                 && lineBeingSent[2] == ' ')
             {
                 double extruderDelta = 0;
-                GCodeFile.GetFirstNumberAfter("E", lineBeingSent, ref extruderDelta);
+                GCodeFile.GetFirstNumberAfter('E', lineBeingSent, ref extruderDelta);
                 double feedRate = 0;
-                GCodeFile.GetFirstNumberAfter("F", lineBeingSent, ref feedRate);
+                GCodeFile.GetFirstNumberAfter('F', lineBeingSent, ref feedRate);
 
                 string newLine = "G1 ";
 
@@ -97,9 +97,9 @@ namespace MatterHackers.MatterControl
                     if (movementMode == PrinterMachineInstruction.MovementTypes.Relative)
                     {
                         Vector3 relativeMove = Vector3.Zero;
-                        GCodeFile.GetFirstNumberAfter("X", lineBeingSent, ref relativeMove.x);
-                        GCodeFile.GetFirstNumberAfter("Y", lineBeingSent, ref relativeMove.y);
-                        GCodeFile.GetFirstNumberAfter("Z", lineBeingSent, ref relativeMove.z);
+                        GCodeFile.GetFirstNumberAfter('X', lineBeingSent, ref relativeMove.x);
+                        GCodeFile.GetFirstNumberAfter('Y', lineBeingSent, ref relativeMove.y);
+                        GCodeFile.GetFirstNumberAfter('Z', lineBeingSent, ref relativeMove.z);
                         outPosition = PrintLeveling.Instance.ApplyLevelingRotation(relativeMove);
                     }