diff --git a/public/kcl-samples/food-service-spatula/main.kcl b/public/kcl-samples/food-service-spatula/main.kcl
index c135ec052..46a89c7e1 100644
--- a/public/kcl-samples/food-service-spatula/main.kcl
+++ b/public/kcl-samples/food-service-spatula/main.kcl
@@ -35,19 +35,19 @@ fn slot(sketch1, start, end, width) {
   xstart = width / 2 * cos(toRadians(angle - 90)) + start[0]
   ystart = width / 2 * sin(toRadians(angle - 90)) + start[1]
   slotSketch = startProfileAt([xstart, ystart], sketch1)
-    |> angledLine({ angle = angle, length = dist }, %, $line000)
-    |> tangentialArc({ radius = width / 2, offset = 180 }, %, $arc000)
-    |> angledLine({ angle = angle, length = -dist }, %, $line001)
-    |> tangentialArcTo([profileStartX(%), profileStartY(%)], %, $arc001)
+    |> angledLine({ angle = angle, length = dist }, %)
+    |> tangentialArc({ radius = width / 2, offset = 180 }, %)
+    |> angledLine({ angle = angle, length = -dist }, %)
+    |> tangentialArcTo([profileStartX(%), profileStartY(%)], %)
     |> close()
   return slotSketch
 }
 
-// Create a sketch on the "XY" plane
-sketch000 = startSketchOn(XY)
+// Create a sketch on the "XY" plane for the flipper
+flipperSketch = startSketchOn(XY)
 
 // Create a profile of the flipper
-flipperProfile = startProfileAt([-flipperLength, -32.0], sketch000)
+flipperProfile = startProfileAt([-flipperLength, -32.0], flipperSketch)
   |> line(end = [flipperLength, 2.0])
   |> yLine(length = 60.0, tag = $backEdge)
   |> line(end = [-flipperLength, 2.0])
@@ -59,13 +59,13 @@ flipperProfile = startProfileAt([-flipperLength, -32.0], sketch000)
   |> close()
 
 // Create a profile of the middle
-slotProfile000 = slot(sketch000, [-25, 0], [-55, 0], flipperSlotWidth)
+slotProfile000 = slot(flipperSketch, [-25, 0], [-55, 0], flipperSlotWidth)
 
 // Create a profile of the top slot
-slotProfile001 = slot(sketch000, [-25, 18], [-55, 19], flipperSlotWidth)
+slotProfile001 = slot(flipperSketch, [-25, 18], [-55, 19], flipperSlotWidth)
 
 // Create a profile of the bottom slot
-slotProfile002 = slot(sketch000, [-25, -18], [-55, -19], flipperSlotWidth)
+slotProfile002 = slot(flipperSketch, [-25, -18], [-55, -19], flipperSlotWidth)
 
 // Create a profile with slots for the spatula
 spatulaProfile = flipperProfile
@@ -87,10 +87,10 @@ fillet(
 )
 
 // Create a sketch on the "XZ" plane offset by half the thickness
-sketch001 = startSketchOn(offsetPlane(XZ, offset = -handleWidth / 2))
+handleSketch = startSketchOn(offsetPlane(XZ, offset = -handleWidth / 2))
 
 // Create a profile of the spatula handle
-handleProfile = startProfileAt([0.0, flipperThickness], sketch001)
+handleProfile = startProfileAt([0.0, flipperThickness], handleSketch)
   |> line(end = [31.819805, 31.819805], tag = $handleBottomEdge)
   |> line(end = [140.953893, 51.303021])
   |> line(end = [-1.710101, 4.698463])
@@ -99,7 +99,7 @@ handleProfile = startProfileAt([0.0, flipperThickness], sketch001)
   |> xLine(length = 7.071068)
   |> close()
 
-// Create an extrusion extrude001
+// Create an extrusion
 handle = extrude(handleProfile, length = handleWidth)
 
 // Fillet the bend of the spatula handle
@@ -123,10 +123,10 @@ handlePlane = {
 }
 
 // Create a sketch on the handle plane
-sketch002 = startSketchOn(handlePlane)
+gripSketch = startSketchOn(handlePlane)
 
 // Create a profile of the grip
-gripProfile = startProfileAt([-26.806746, -10.0], sketch002)
+gripProfile = startProfileAt([-26.806746, -10.0], gripSketch)
   |> xLine(length = gripWidth - (2 * gripFilletRadius))
   |> arc({
        angleStart = -90.0,
@@ -157,10 +157,10 @@ gripProfile = startProfileAt([-26.806746, -10.0], sketch002)
 grip = extrude(gripProfile, length = -gripLength)
 
 // Create a sketch on the grip for the hole
-sketch003 = startSketchOn(grip, gripEdgeTop)
+holeSketch = startSketchOn(grip, gripEdgeTop)
 
 // Create a profile for the grip hole
-gripHoleProfile = slot(sketch003, [0, 200], [0, 210], gripSlotWidth)
+gripHoleProfile = slot(holeSketch, [0, 200], [0, 210], gripSlotWidth)
 
 // Cut a hole in the grip
 extrude(gripHoleProfile, length = -gripWidth - 20)
diff --git a/rust/kcl-lib/tests/kcl_samples/food-service-spatula/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/food-service-spatula/artifact_graph_flowchart.snap.md
index 0734c3e6e..5018df53d 100644
--- a/rust/kcl-lib/tests/kcl_samples/food-service-spatula/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/kcl_samples/food-service-spatula/artifact_graph_flowchart.snap.md
@@ -1,76 +1,76 @@
 ```mermaid
 flowchart LR
   subgraph path2 [Path]
-    2["Path<br>[1476, 1526, 0]"]
-    3["Segment<br>[1532, 1564, 0]"]
-    4["Segment<br>[1570, 1607, 0]"]
-    5["Segment<br>[1613, 1646, 0]"]
-    6["Segment<br>[1652, 1752, 0]"]
-    7["Segment<br>[1758, 1765, 0]"]
+    2["Path<br>[1458, 1512, 0]"]
+    3["Segment<br>[1518, 1550, 0]"]
+    4["Segment<br>[1556, 1593, 0]"]
+    5["Segment<br>[1599, 1632, 0]"]
+    6["Segment<br>[1638, 1738, 0]"]
+    7["Segment<br>[1744, 1751, 0]"]
     8[Solid2d]
   end
   subgraph path9 [Path]
     9["Path<br>[1001, 1042, 0]"]
-    10["Segment<br>[1050, 1107, 0]"]
-    11["Segment<br>[1115, 1178, 0]"]
-    12["Segment<br>[1186, 1244, 0]"]
-    13["Segment<br>[1252, 1317, 0]"]
-    14["Segment<br>[1325, 1332, 0]"]
+    10["Segment<br>[1050, 1097, 0]"]
+    11["Segment<br>[1105, 1159, 0]"]
+    12["Segment<br>[1167, 1215, 0]"]
+    13["Segment<br>[1223, 1279, 0]"]
+    14["Segment<br>[1287, 1294, 0]"]
     15[Solid2d]
   end
   subgraph path16 [Path]
     16["Path<br>[1001, 1042, 0]"]
-    17["Segment<br>[1050, 1107, 0]"]
-    18["Segment<br>[1115, 1178, 0]"]
-    19["Segment<br>[1186, 1244, 0]"]
-    20["Segment<br>[1252, 1317, 0]"]
-    21["Segment<br>[1325, 1332, 0]"]
+    17["Segment<br>[1050, 1097, 0]"]
+    18["Segment<br>[1105, 1159, 0]"]
+    19["Segment<br>[1167, 1215, 0]"]
+    20["Segment<br>[1223, 1279, 0]"]
+    21["Segment<br>[1287, 1294, 0]"]
     22[Solid2d]
   end
   subgraph path23 [Path]
     23["Path<br>[1001, 1042, 0]"]
-    24["Segment<br>[1050, 1107, 0]"]
-    25["Segment<br>[1115, 1178, 0]"]
-    26["Segment<br>[1186, 1244, 0]"]
-    27["Segment<br>[1252, 1317, 0]"]
-    28["Segment<br>[1325, 1332, 0]"]
+    24["Segment<br>[1050, 1097, 0]"]
+    25["Segment<br>[1105, 1159, 0]"]
+    26["Segment<br>[1167, 1215, 0]"]
+    27["Segment<br>[1223, 1279, 0]"]
+    28["Segment<br>[1287, 1294, 0]"]
     29[Solid2d]
   end
   subgraph path49 [Path]
-    49["Path<br>[2753, 2803, 0]"]
-    50["Segment<br>[2809, 2868, 0]"]
-    51["Segment<br>[2874, 2909, 0]"]
-    52["Segment<br>[2915, 2948, 0]"]
-    53["Segment<br>[2954, 3013, 0]"]
-    54["Segment<br>[3019, 3055, 0]"]
-    55["Segment<br>[3061, 3085, 0]"]
-    56["Segment<br>[3091, 3098, 0]"]
+    49["Path<br>[2754, 2807, 0]"]
+    50["Segment<br>[2813, 2872, 0]"]
+    51["Segment<br>[2878, 2913, 0]"]
+    52["Segment<br>[2919, 2952, 0]"]
+    53["Segment<br>[2958, 3017, 0]"]
+    54["Segment<br>[3023, 3059, 0]"]
+    55["Segment<br>[3065, 3089, 0]"]
+    56["Segment<br>[3095, 3102, 0]"]
     57[Solid2d]
   end
   subgraph path83 [Path]
-    83["Path<br>[3727, 3773, 0]"]
-    84["Segment<br>[3779, 3829, 0]"]
-    85["Segment<br>[3835, 3934, 0]"]
-    86["Segment<br>[3940, 3991, 0]"]
-    87["Segment<br>[3997, 4095, 0]"]
-    88["Segment<br>[4101, 4154, 0]"]
-    89["Segment<br>[4160, 4260, 0]"]
-    90["Segment<br>[4266, 4340, 0]"]
-    91["Segment<br>[4346, 4447, 0]"]
-    92["Segment<br>[4453, 4460, 0]"]
+    83["Path<br>[3721, 3768, 0]"]
+    84["Segment<br>[3774, 3824, 0]"]
+    85["Segment<br>[3830, 3929, 0]"]
+    86["Segment<br>[3935, 3986, 0]"]
+    87["Segment<br>[3992, 4090, 0]"]
+    88["Segment<br>[4096, 4149, 0]"]
+    89["Segment<br>[4155, 4255, 0]"]
+    90["Segment<br>[4261, 4335, 0]"]
+    91["Segment<br>[4341, 4442, 0]"]
+    92["Segment<br>[4448, 4455, 0]"]
     93[Solid2d]
   end
   subgraph path121 [Path]
     121["Path<br>[1001, 1042, 0]"]
-    122["Segment<br>[1050, 1107, 0]"]
-    123["Segment<br>[1115, 1178, 0]"]
-    124["Segment<br>[1186, 1244, 0]"]
-    125["Segment<br>[1252, 1317, 0]"]
-    126["Segment<br>[1325, 1332, 0]"]
+    122["Segment<br>[1050, 1097, 0]"]
+    123["Segment<br>[1105, 1159, 0]"]
+    124["Segment<br>[1167, 1215, 0]"]
+    125["Segment<br>[1223, 1279, 0]"]
+    126["Segment<br>[1287, 1294, 0]"]
     127[Solid2d]
   end
-  1["Plane<br>[1405, 1422, 0]"]
-  30["Sweep Extrusion<br>[2328, 2378, 0]"]
+  1["Plane<br>[1387, 1404, 0]"]
+  30["Sweep Extrusion<br>[2326, 2376, 0]"]
   31[Wall]
   32[Wall]
   33[Wall]
@@ -88,8 +88,8 @@ flowchart LR
   45["SweepEdge Adjacent"]
   46["SweepEdge Opposite"]
   47["SweepEdge Adjacent"]
-  48["Plane<br>[2650, 2692, 0]"]
-  58["Sweep Extrusion<br>[3143, 3187, 0]"]
+  48["Plane<br>[2651, 2693, 0]"]
+  58["Sweep Extrusion<br>[3136, 3180, 0]"]
   59[Wall]
   60[Wall]
   61[Wall]
@@ -113,8 +113,8 @@ flowchart LR
   79["SweepEdge Adjacent"]
   80["SweepEdge Opposite"]
   81["SweepEdge Adjacent"]
-  82["Plane<br>[3653, 3679, 0]"]
-  94["Sweep Extrusion<br>[4516, 4558, 0]"]
+  82["Plane<br>[3647, 3673, 0]"]
+  94["Sweep Extrusion<br>[4511, 4553, 0]"]
   95[Wall]
   96[Wall]
   97[Wall]
@@ -141,7 +141,7 @@ flowchart LR
   118["SweepEdge Adjacent"]
   119["SweepEdge Opposite"]
   120["SweepEdge Adjacent"]
-  128["Sweep Extrusion<br>[4784, 4834, 0]"]
+  128["Sweep Extrusion<br>[4781, 4831, 0]"]
   129[Wall]
   130[Wall]
   131[Wall]
@@ -154,12 +154,12 @@ flowchart LR
   138["SweepEdge Adjacent"]
   139["SweepEdge Opposite"]
   140["SweepEdge Adjacent"]
-  141["EdgeCut Fillet<br>[2415, 2556, 0]"]
-  142["EdgeCut Fillet<br>[2415, 2556, 0]"]
-  143["EdgeCut Fillet<br>[3230, 3361, 0]"]
-  144["EdgeCut Fillet<br>[3230, 3361, 0]"]
-  145["StartSketchOnPlane<br>[2636, 2693, 0]"]
-  146["StartSketchOnFace<br>[4616, 4648, 0]"]
+  141["EdgeCut Fillet<br>[2413, 2554, 0]"]
+  142["EdgeCut Fillet<br>[2413, 2554, 0]"]
+  143["EdgeCut Fillet<br>[3223, 3354, 0]"]
+  144["EdgeCut Fillet<br>[3223, 3354, 0]"]
+  145["StartSketchOnPlane<br>[2637, 2694, 0]"]
+  146["StartSketchOnFace<br>[4612, 4644, 0]"]
   1 --- 2
   1 --- 9
   1 --- 16
diff --git a/rust/kcl-lib/tests/kcl_samples/food-service-spatula/ast.snap b/rust/kcl-lib/tests/kcl_samples/food-service-spatula/ast.snap
index 37b9e26b5..305005ff1 100644
--- a/rust/kcl-lib/tests/kcl_samples/food-service-spatula/ast.snap
+++ b/rust/kcl-lib/tests/kcl_samples/food-service-spatula/ast.snap
@@ -1882,14 +1882,6 @@ description: Result of parsing food-service-spatula.kcl
                               "start": 0,
                               "type": "PipeSubstitution",
                               "type": "PipeSubstitution"
-                            },
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "TagDeclarator",
-                              "type": "TagDeclarator",
-                              "value": "line000"
                             }
                           ],
                           "callee": {
@@ -2004,14 +1996,6 @@ description: Result of parsing food-service-spatula.kcl
                               "start": 0,
                               "type": "PipeSubstitution",
                               "type": "PipeSubstitution"
-                            },
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "TagDeclarator",
-                              "type": "TagDeclarator",
-                              "value": "arc000"
                             }
                           ],
                           "callee": {
@@ -2118,14 +2102,6 @@ description: Result of parsing food-service-spatula.kcl
                               "start": 0,
                               "type": "PipeSubstitution",
                               "type": "PipeSubstitution"
-                            },
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "TagDeclarator",
-                              "type": "TagDeclarator",
-                              "value": "line001"
                             }
                           ],
                           "callee": {
@@ -2228,14 +2204,6 @@ description: Result of parsing food-service-spatula.kcl
                               "start": 0,
                               "type": "PipeSubstitution",
                               "type": "PipeSubstitution"
-                            },
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "TagDeclarator",
-                              "type": "TagDeclarator",
-                              "value": "arc001"
                             }
                           ],
                           "callee": {
@@ -2396,7 +2364,7 @@ description: Result of parsing food-service-spatula.kcl
           "id": {
             "commentStart": 0,
             "end": 0,
-            "name": "sketch000",
+            "name": "flipperSketch",
             "start": 0,
             "type": "Identifier"
           },
@@ -2448,7 +2416,7 @@ description: Result of parsing food-service-spatula.kcl
         "preComments": [
           "",
           "",
-          "// Create a sketch on the \"XY\" plane"
+          "// Create a sketch on the \"XY\" plane for the flipper"
         ],
         "start": 0,
         "type": "VariableDeclaration",
@@ -2530,7 +2498,7 @@ description: Result of parsing food-service-spatula.kcl
                     "name": {
                       "commentStart": 0,
                       "end": 0,
-                      "name": "sketch000",
+                      "name": "flipperSketch",
                       "start": 0,
                       "type": "Identifier"
                     },
@@ -2976,7 +2944,7 @@ description: Result of parsing food-service-spatula.kcl
                 "name": {
                   "commentStart": 0,
                   "end": 0,
-                  "name": "sketch000",
+                  "name": "flipperSketch",
                   "start": 0,
                   "type": "Identifier"
                 },
@@ -3135,7 +3103,7 @@ description: Result of parsing food-service-spatula.kcl
                 "name": {
                   "commentStart": 0,
                   "end": 0,
-                  "name": "sketch000",
+                  "name": "flipperSketch",
                   "start": 0,
                   "type": "Identifier"
                 },
@@ -3299,7 +3267,7 @@ description: Result of parsing food-service-spatula.kcl
                 "name": {
                   "commentStart": 0,
                   "end": 0,
-                  "name": "sketch000",
+                  "name": "flipperSketch",
                   "start": 0,
                   "type": "Identifier"
                 },
@@ -3940,7 +3908,7 @@ description: Result of parsing food-service-spatula.kcl
           "id": {
             "commentStart": 0,
             "end": 0,
-            "name": "sketch001",
+            "name": "handleSketch",
             "start": 0,
             "type": "Identifier"
           },
@@ -4136,7 +4104,7 @@ description: Result of parsing food-service-spatula.kcl
                     "name": {
                       "commentStart": 0,
                       "end": 0,
-                      "name": "sketch001",
+                      "name": "handleSketch",
                       "start": 0,
                       "type": "Identifier"
                     },
@@ -4666,7 +4634,7 @@ description: Result of parsing food-service-spatula.kcl
                     "type": "NonCodeNode",
                     "value": {
                       "type": "newLineBlockComment",
-                      "value": "Create an extrusion extrude001",
+                      "value": "Create an extrusion",
                       "style": "line"
                     }
                   }
@@ -5273,7 +5241,7 @@ description: Result of parsing food-service-spatula.kcl
           "id": {
             "commentStart": 0,
             "end": 0,
-            "name": "sketch002",
+            "name": "gripSketch",
             "start": 0,
             "type": "Identifier"
           },
@@ -5403,7 +5371,7 @@ description: Result of parsing food-service-spatula.kcl
                     "name": {
                       "commentStart": 0,
                       "end": 0,
-                      "name": "sketch002",
+                      "name": "gripSketch",
                       "start": 0,
                       "type": "Identifier"
                     },
@@ -6497,7 +6465,7 @@ description: Result of parsing food-service-spatula.kcl
           "id": {
             "commentStart": 0,
             "end": 0,
-            "name": "sketch003",
+            "name": "holeSketch",
             "start": 0,
             "type": "Identifier"
           },
@@ -6592,7 +6560,7 @@ description: Result of parsing food-service-spatula.kcl
                 "name": {
                   "commentStart": 0,
                   "end": 0,
-                  "name": "sketch003",
+                  "name": "holeSketch",
                   "start": 0,
                   "type": "Identifier"
                 },
diff --git a/rust/kcl-lib/tests/kcl_samples/food-service-spatula/ops.snap b/rust/kcl-lib/tests/kcl_samples/food-service-spatula/ops.snap
index 50f32c15f..ada5cf122 100644
--- a/rust/kcl-lib/tests/kcl_samples/food-service-spatula/ops.snap
+++ b/rust/kcl-lib/tests/kcl_samples/food-service-spatula/ops.snap
@@ -25,7 +25,7 @@ description: Operations executed food-service-spatula.kcl
       "name": "slot",
       "functionSourceRange": [
         462,
-        1354,
+        1316,
         0
       ],
       "unlabeledArg": null,
@@ -79,7 +79,7 @@ description: Operations executed food-service-spatula.kcl
       "name": "slot",
       "functionSourceRange": [
         462,
-        1354,
+        1316,
         0
       ],
       "unlabeledArg": null,
@@ -133,7 +133,7 @@ description: Operations executed food-service-spatula.kcl
       "name": "slot",
       "functionSourceRange": [
         462,
-        1354,
+        1316,
         0
       ],
       "unlabeledArg": null,
@@ -719,7 +719,7 @@ description: Operations executed food-service-spatula.kcl
       "name": "slot",
       "functionSourceRange": [
         462,
-        1354,
+        1316,
         0
       ],
       "unlabeledArg": null,
diff --git a/rust/kcl-lib/tests/kcl_samples/food-service-spatula/program_memory.snap b/rust/kcl-lib/tests/kcl_samples/food-service-spatula/program_memory.snap
index b2602d99a..dcba69f69 100644
--- a/rust/kcl-lib/tests/kcl_samples/food-service-spatula/program_memory.snap
+++ b/rust/kcl-lib/tests/kcl_samples/food-service-spatula/program_memory.snap
@@ -3,16 +3,6 @@ source: kcl-lib/src/simulation_tests.rs
 description: Variables in memory after executing food-service-spatula.kcl
 ---
 {
-  "arc000": {
-    "type": "TagIdentifier",
-    "type": "TagIdentifier",
-    "value": "arc000"
-  },
-  "arc001": {
-    "type": "TagIdentifier",
-    "type": "TagIdentifier",
-    "value": "arc001"
-  },
   "backEdge": {
     "type": "TagIdentifier",
     "type": "TagIdentifier",
@@ -37,9 +27,9 @@ description: Variables in memory after executing food-service-spatula.kcl
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 1597,
-            "end": 1606,
-            "start": 1597,
+            "commentStart": 1583,
+            "end": 1592,
+            "start": 1583,
             "type": "TagDeclarator",
             "value": "backEdge"
           },
@@ -100,9 +90,9 @@ description: Variables in memory after executing food-service-spatula.kcl
               -30.0
             ],
             "tag": {
-              "commentStart": 1597,
-              "end": 1606,
-              "start": 1597,
+              "commentStart": 1583,
+              "end": 1592,
+              "start": 1583,
               "type": "TagDeclarator",
               "value": "backEdge"
             },
@@ -307,9 +297,9 @@ description: Variables in memory after executing food-service-spatula.kcl
             -30.0
           ],
           "tag": {
-            "commentStart": 1597,
-            "end": 1606,
-            "start": 1597,
+            "commentStart": 1583,
+            "end": 1592,
+            "start": 1583,
             "type": "TagDeclarator",
             "value": "backEdge"
           },
@@ -446,6 +436,37 @@ description: Variables in memory after executing food-service-spatula.kcl
       }
     }
   },
+  "flipperSketch": {
+    "type": "Plane",
+    "value": {
+      "id": "[uuid]",
+      "artifactId": "[uuid]",
+      "value": "XY",
+      "origin": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+      },
+      "xAxis": {
+        "x": 1.0,
+        "y": 0.0,
+        "z": 0.0
+      },
+      "yAxis": {
+        "x": 0.0,
+        "y": 1.0,
+        "z": 0.0
+      },
+      "zAxis": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 1.0
+      },
+      "units": {
+        "type": "Mm"
+      }
+    }
+  },
   "flipperSlotWidth": {
     "type": "Number",
     "value": 10.0,
@@ -526,9 +547,9 @@ description: Variables in memory after executing food-service-spatula.kcl
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 4327,
-            "end": 4339,
-            "start": 4327,
+            "commentStart": 4322,
+            "end": 4334,
+            "start": 4322,
             "type": "TagDeclarator",
             "value": "gripEdgeTop"
           },
@@ -688,9 +709,9 @@ description: Variables in memory after executing food-service-spatula.kcl
               7.0
             ],
             "tag": {
-              "commentStart": 4327,
-              "end": 4339,
-              "start": 4327,
+              "commentStart": 4322,
+              "end": 4334,
+              "start": 4322,
               "type": "TagDeclarator",
               "value": "gripEdgeTop"
             },
@@ -861,13 +882,7 @@ description: Variables in memory after executing food-service-spatula.kcl
             4.0,
             200.0
           ],
-          "tag": {
-            "commentStart": 1098,
-            "end": 1106,
-            "start": 1098,
-            "type": "TagDeclarator",
-            "value": "line000"
-          },
+          "tag": null,
           "to": [
             4.0,
             210.0
@@ -891,13 +906,7 @@ description: Variables in memory after executing food-service-spatula.kcl
             4.0,
             210.0
           ],
-          "tag": {
-            "commentStart": 1170,
-            "end": 1177,
-            "start": 1170,
-            "type": "TagDeclarator",
-            "value": "arc000"
-          },
+          "tag": null,
           "to": [
             -4.0,
             210.0
@@ -916,13 +925,7 @@ description: Variables in memory after executing food-service-spatula.kcl
             -4.0,
             210.0
           ],
-          "tag": {
-            "commentStart": 1235,
-            "end": 1243,
-            "start": 1235,
-            "type": "TagDeclarator",
-            "value": "line001"
-          },
+          "tag": null,
           "to": [
             -4.0,
             200.0
@@ -946,13 +949,7 @@ description: Variables in memory after executing food-service-spatula.kcl
             -4.0,
             200.0
           ],
-          "tag": {
-            "commentStart": 1309,
-            "end": 1316,
-            "start": 1309,
-            "type": "TagDeclarator",
-            "value": "arc001"
-          },
+          "tag": null,
           "to": [
             4.0,
             200.0
@@ -1054,9 +1051,9 @@ description: Variables in memory after executing food-service-spatula.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 4327,
-                "end": 4339,
-                "start": 4327,
+                "commentStart": 4322,
+                "end": 4334,
+                "start": 4322,
                 "type": "TagDeclarator",
                 "value": "gripEdgeTop"
               },
@@ -1216,9 +1213,9 @@ description: Variables in memory after executing food-service-spatula.kcl
                   7.0
                 ],
                 "tag": {
-                  "commentStart": 4327,
-                  "end": 4339,
-                  "start": 4327,
+                  "commentStart": 4322,
+                  "end": 4334,
+                  "start": 4322,
                   "type": "TagDeclarator",
                   "value": "gripEdgeTop"
                 },
@@ -1364,24 +1361,6 @@ description: Variables in memory after executing food-service-spatula.kcl
           "sourceRange": []
         }
       },
-      "tags": {
-        "arc000": {
-          "type": "TagIdentifier",
-          "value": "arc000"
-        },
-        "arc001": {
-          "type": "TagIdentifier",
-          "value": "arc001"
-        },
-        "line000": {
-          "type": "TagIdentifier",
-          "value": "line000"
-        },
-        "line001": {
-          "type": "TagIdentifier",
-          "value": "line001"
-        }
-      },
       "artifactId": "[uuid]",
       "originalId": "[uuid]",
       "units": {
@@ -1550,9 +1529,9 @@ description: Variables in memory after executing food-service-spatula.kcl
             7.0
           ],
           "tag": {
-            "commentStart": 4327,
-            "end": 4339,
-            "start": 4327,
+            "commentStart": 4322,
+            "end": 4334,
+            "start": 4322,
             "type": "TagDeclarator",
             "value": "gripEdgeTop"
           },
@@ -1670,6 +1649,37 @@ description: Variables in memory after executing food-service-spatula.kcl
       }
     }
   },
+  "gripSketch": {
+    "type": "Plane",
+    "value": {
+      "id": "[uuid]",
+      "artifactId": "[uuid]",
+      "value": "Custom",
+      "origin": {
+        "x": 208.593833,
+        "y": 0.0,
+        "z": 75.921946
+      },
+      "xAxis": {
+        "x": 0.34202,
+        "y": -0.0,
+        "z": -0.939693
+      },
+      "yAxis": {
+        "x": 0.0,
+        "y": 1.0,
+        "z": 0.0
+      },
+      "zAxis": {
+        "x": 0.939693,
+        "y": -0.0,
+        "z": 0.34202
+      },
+      "units": {
+        "type": "Mm"
+      }
+    }
+  },
   "gripSlotWidth": {
     "type": "Number",
     "value": 8.0,
@@ -1708,9 +1718,9 @@ description: Variables in memory after executing food-service-spatula.kcl
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 2850,
-            "end": 2867,
-            "start": 2850,
+            "commentStart": 2854,
+            "end": 2871,
+            "start": 2854,
             "type": "TagDeclarator",
             "value": "handleBottomEdge"
           },
@@ -1735,9 +1745,9 @@ description: Variables in memory after executing food-service-spatula.kcl
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 2998,
-            "end": 3012,
-            "start": 2998,
+            "commentStart": 3002,
+            "end": 3016,
+            "start": 3002,
             "type": "TagDeclarator",
             "value": "handleTopEdge"
           },
@@ -1779,9 +1789,9 @@ description: Variables in memory after executing food-service-spatula.kcl
               3.5
             ],
             "tag": {
-              "commentStart": 2850,
-              "end": 2867,
-              "start": 2850,
+              "commentStart": 2854,
+              "end": 2871,
+              "start": 2854,
               "type": "TagDeclarator",
               "value": "handleBottomEdge"
             },
@@ -1842,9 +1852,9 @@ description: Variables in memory after executing food-service-spatula.kcl
               91.3213
             ],
             "tag": {
-              "commentStart": 2998,
-              "end": 3012,
-              "start": 2998,
+              "commentStart": 3002,
+              "end": 3016,
+              "start": 3002,
               "type": "TagDeclarator",
               "value": "handleTopEdge"
             },
@@ -2193,9 +2203,9 @@ description: Variables in memory after executing food-service-spatula.kcl
             3.5
           ],
           "tag": {
-            "commentStart": 2850,
-            "end": 2867,
-            "start": 2850,
+            "commentStart": 2854,
+            "end": 2871,
+            "start": 2854,
             "type": "TagDeclarator",
             "value": "handleBottomEdge"
           },
@@ -2256,9 +2266,9 @@ description: Variables in memory after executing food-service-spatula.kcl
             91.3213
           ],
           "tag": {
-            "commentStart": 2998,
-            "end": 3012,
-            "start": 2998,
+            "commentStart": 3002,
+            "end": 3016,
+            "start": 3002,
             "type": "TagDeclarator",
             "value": "handleTopEdge"
           },
@@ -2393,66 +2403,7 @@ description: Variables in memory after executing food-service-spatula.kcl
       }
     }
   },
-  "handleTopEdge": {
-    "type": "TagIdentifier",
-    "type": "TagIdentifier",
-    "value": "handleTopEdge"
-  },
-  "handleWidth": {
-    "type": "Number",
-    "value": 15.0,
-    "ty": {
-      "type": "Default",
-      "len": {
-        "type": "Mm"
-      },
-      "angle": {
-        "type": "Degrees"
-      }
-    }
-  },
-  "line000": {
-    "type": "TagIdentifier",
-    "type": "TagIdentifier",
-    "value": "line000"
-  },
-  "line001": {
-    "type": "TagIdentifier",
-    "type": "TagIdentifier",
-    "value": "line001"
-  },
-  "sketch000": {
-    "type": "Plane",
-    "value": {
-      "id": "[uuid]",
-      "artifactId": "[uuid]",
-      "value": "XY",
-      "origin": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0
-      },
-      "xAxis": {
-        "x": 1.0,
-        "y": 0.0,
-        "z": 0.0
-      },
-      "yAxis": {
-        "x": 0.0,
-        "y": 1.0,
-        "z": 0.0
-      },
-      "zAxis": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 1.0
-      },
-      "units": {
-        "type": "Mm"
-      }
-    }
-  },
-  "sketch001": {
+  "handleSketch": {
     "type": "Plane",
     "value": {
       "id": "[uuid]",
@@ -2483,38 +2434,25 @@ description: Variables in memory after executing food-service-spatula.kcl
       }
     }
   },
-  "sketch002": {
-    "type": "Plane",
-    "value": {
-      "id": "[uuid]",
-      "artifactId": "[uuid]",
-      "value": "Custom",
-      "origin": {
-        "x": 208.593833,
-        "y": 0.0,
-        "z": 75.921946
-      },
-      "xAxis": {
-        "x": 0.34202,
-        "y": -0.0,
-        "z": -0.939693
-      },
-      "yAxis": {
-        "x": 0.0,
-        "y": 1.0,
-        "z": 0.0
-      },
-      "zAxis": {
-        "x": 0.939693,
-        "y": -0.0,
-        "z": 0.34202
-      },
-      "units": {
+  "handleTopEdge": {
+    "type": "TagIdentifier",
+    "type": "TagIdentifier",
+    "value": "handleTopEdge"
+  },
+  "handleWidth": {
+    "type": "Number",
+    "value": 15.0,
+    "ty": {
+      "type": "Default",
+      "len": {
         "type": "Mm"
+      },
+      "angle": {
+        "type": "Degrees"
       }
     }
   },
-  "sketch003": {
+  "holeSketch": {
     "type": "Face",
     "value": {
       "id": "[uuid]",
@@ -2587,9 +2525,9 @@ description: Variables in memory after executing food-service-spatula.kcl
             "id": "[uuid]",
             "sourceRange": [],
             "tag": {
-              "commentStart": 4327,
-              "end": 4339,
-              "start": 4327,
+              "commentStart": 4322,
+              "end": 4334,
+              "start": 4322,
               "type": "TagDeclarator",
               "value": "gripEdgeTop"
             },
@@ -2749,9 +2687,9 @@ description: Variables in memory after executing food-service-spatula.kcl
                 7.0
               ],
               "tag": {
-                "commentStart": 4327,
-                "end": 4339,
-                "start": 4327,
+                "commentStart": 4322,
+                "end": 4334,
+                "start": 4322,
                 "type": "TagDeclarator",
                 "value": "gripEdgeTop"
               },
@@ -2898,13 +2836,7 @@ description: Variables in memory after executing food-service-spatula.kcl
             -25.0,
             5.0
           ],
-          "tag": {
-            "commentStart": 1098,
-            "end": 1106,
-            "start": 1098,
-            "type": "TagDeclarator",
-            "value": "line000"
-          },
+          "tag": null,
           "to": [
             -55.0,
             5.0
@@ -2928,13 +2860,7 @@ description: Variables in memory after executing food-service-spatula.kcl
             -55.0,
             5.0
           ],
-          "tag": {
-            "commentStart": 1170,
-            "end": 1177,
-            "start": 1170,
-            "type": "TagDeclarator",
-            "value": "arc000"
-          },
+          "tag": null,
           "to": [
             -55.0,
             -5.0
@@ -2953,13 +2879,7 @@ description: Variables in memory after executing food-service-spatula.kcl
             -55.0,
             -5.0
           ],
-          "tag": {
-            "commentStart": 1235,
-            "end": 1243,
-            "start": 1235,
-            "type": "TagDeclarator",
-            "value": "line001"
-          },
+          "tag": null,
           "to": [
             -25.0,
             -5.0
@@ -2983,13 +2903,7 @@ description: Variables in memory after executing food-service-spatula.kcl
             -25.0,
             -5.0
           ],
-          "tag": {
-            "commentStart": 1309,
-            "end": 1316,
-            "start": 1309,
-            "type": "TagDeclarator",
-            "value": "arc001"
-          },
+          "tag": null,
           "to": [
             -25.0,
             5.0
@@ -3066,24 +2980,6 @@ description: Variables in memory after executing food-service-spatula.kcl
           "sourceRange": []
         }
       },
-      "tags": {
-        "arc000": {
-          "type": "TagIdentifier",
-          "value": "arc000"
-        },
-        "arc001": {
-          "type": "TagIdentifier",
-          "value": "arc001"
-        },
-        "line000": {
-          "type": "TagIdentifier",
-          "value": "line000"
-        },
-        "line001": {
-          "type": "TagIdentifier",
-          "value": "line001"
-        }
-      },
       "artifactId": "[uuid]",
       "originalId": "[uuid]",
       "units": {
@@ -3106,13 +3002,7 @@ description: Variables in memory after executing food-service-spatula.kcl
             -24.8334,
             22.9972
           ],
-          "tag": {
-            "commentStart": 1098,
-            "end": 1106,
-            "start": 1098,
-            "type": "TagDeclarator",
-            "value": "line000"
-          },
+          "tag": null,
           "to": [
             -54.8334,
             23.9972
@@ -3136,13 +3026,7 @@ description: Variables in memory after executing food-service-spatula.kcl
             -54.8334,
             23.9972
           ],
-          "tag": {
-            "commentStart": 1170,
-            "end": 1177,
-            "start": 1170,
-            "type": "TagDeclarator",
-            "value": "arc000"
-          },
+          "tag": null,
           "to": [
             -55.1666,
             14.0028
@@ -3161,13 +3045,7 @@ description: Variables in memory after executing food-service-spatula.kcl
             -55.1666,
             14.0028
           ],
-          "tag": {
-            "commentStart": 1235,
-            "end": 1243,
-            "start": 1235,
-            "type": "TagDeclarator",
-            "value": "line001"
-          },
+          "tag": null,
           "to": [
             -25.1666,
             13.0028
@@ -3191,13 +3069,7 @@ description: Variables in memory after executing food-service-spatula.kcl
             -25.1666,
             13.0028
           ],
-          "tag": {
-            "commentStart": 1309,
-            "end": 1316,
-            "start": 1309,
-            "type": "TagDeclarator",
-            "value": "arc001"
-          },
+          "tag": null,
           "to": [
             -24.8334,
             22.9972
@@ -3274,24 +3146,6 @@ description: Variables in memory after executing food-service-spatula.kcl
           "sourceRange": []
         }
       },
-      "tags": {
-        "arc000": {
-          "type": "TagIdentifier",
-          "value": "arc000"
-        },
-        "arc001": {
-          "type": "TagIdentifier",
-          "value": "arc001"
-        },
-        "line000": {
-          "type": "TagIdentifier",
-          "value": "line000"
-        },
-        "line001": {
-          "type": "TagIdentifier",
-          "value": "line001"
-        }
-      },
       "artifactId": "[uuid]",
       "originalId": "[uuid]",
       "units": {
@@ -3314,13 +3168,7 @@ description: Variables in memory after executing food-service-spatula.kcl
             -25.1666,
             -13.0028
           ],
-          "tag": {
-            "commentStart": 1098,
-            "end": 1106,
-            "start": 1098,
-            "type": "TagDeclarator",
-            "value": "line000"
-          },
+          "tag": null,
           "to": [
             -55.1666,
             -14.0028
@@ -3344,13 +3192,7 @@ description: Variables in memory after executing food-service-spatula.kcl
             -55.1666,
             -14.0028
           ],
-          "tag": {
-            "commentStart": 1170,
-            "end": 1177,
-            "start": 1170,
-            "type": "TagDeclarator",
-            "value": "arc000"
-          },
+          "tag": null,
           "to": [
             -54.8334,
             -23.9972
@@ -3369,13 +3211,7 @@ description: Variables in memory after executing food-service-spatula.kcl
             -54.8334,
             -23.9972
           ],
-          "tag": {
-            "commentStart": 1235,
-            "end": 1243,
-            "start": 1235,
-            "type": "TagDeclarator",
-            "value": "line001"
-          },
+          "tag": null,
           "to": [
             -24.8334,
             -22.9972
@@ -3399,13 +3235,7 @@ description: Variables in memory after executing food-service-spatula.kcl
             -24.8334,
             -22.9972
           ],
-          "tag": {
-            "commentStart": 1309,
-            "end": 1316,
-            "start": 1309,
-            "type": "TagDeclarator",
-            "value": "arc001"
-          },
+          "tag": null,
           "to": [
             -25.1666,
             -13.0028
@@ -3482,24 +3312,6 @@ description: Variables in memory after executing food-service-spatula.kcl
           "sourceRange": []
         }
       },
-      "tags": {
-        "arc000": {
-          "type": "TagIdentifier",
-          "value": "arc000"
-        },
-        "arc001": {
-          "type": "TagIdentifier",
-          "value": "arc001"
-        },
-        "line000": {
-          "type": "TagIdentifier",
-          "value": "line000"
-        },
-        "line001": {
-          "type": "TagIdentifier",
-          "value": "line001"
-        }
-      },
       "artifactId": "[uuid]",
       "originalId": "[uuid]",
       "units": {
@@ -3542,9 +3354,9 @@ description: Variables in memory after executing food-service-spatula.kcl
             -30.0
           ],
           "tag": {
-            "commentStart": 1597,
-            "end": 1606,
-            "start": 1597,
+            "commentStart": 1583,
+            "end": 1592,
+            "start": 1583,
             "type": "TagDeclarator",
             "value": "backEdge"
           },