diff --git a/plugins/CuraEngineBackend/StartSliceJob.py b/plugins/CuraEngineBackend/StartSliceJob.py
index c5182cc753..746a23dc84 100644
--- a/plugins/CuraEngineBackend/StartSliceJob.py
+++ b/plugins/CuraEngineBackend/StartSliceJob.py
@@ -271,13 +271,15 @@ class StartSliceJob(Job):
         if not self._all_extruders_settings:
             global_stack = Application.getInstance().getGlobalContainerStack()
 
-            self._all_extruders_settings = {}
             # NB: keys must be strings for the string formatter
-            self._all_extruders_settings["-1"] = self._buildReplacementTokens(global_stack)
+            self._all_extruders_settings = {
+                "-1": self._buildReplacementTokens(global_stack)
+            }
 
             for extruder_stack in ExtruderManager.getInstance().getMachineExtruders(global_stack.getId()):
                 extruder_nr = extruder_stack.getProperty("extruder_nr", "value")
                 self._all_extruders_settings[str(extruder_nr)] = self._buildReplacementTokens(extruder_stack)
+
         try:
             # any setting can be used as a token
             fmt = GcodeStartEndFormatter()
diff --git a/resources/definitions/tevo_blackwidow.def.json b/resources/definitions/tevo_blackwidow.def.json
index 19ef2a45e2..9d7166f4a2 100644
--- a/resources/definitions/tevo_blackwidow.def.json
+++ b/resources/definitions/tevo_blackwidow.def.json
@@ -45,10 +45,10 @@
             "default_value": "RepRap (Marlin/Sprinter)"
         },
         "machine_start_gcode": {
-            "default_value": "M280 P0 S160 ; release BLTouch alarm (OK to send for Non BLTouch)\M420 Z2 ; set fade leveling at 2mm for BLTouch (OK to send for Non BLTouch)\G28 ; home all\G29 ; probe bed\G92 E0 ;zero the extruded length\G1 X0.0 Y50.0 Z10.0 F3600\; perform wipe and prime\G1 Z0.0 F1000\G1 Z0.2 Y70.0 E9.0 F1000.0 ; prime\G1 Y100.0 E12.5 F1000.0 ; prime\G92 E0 ; zero extruder again\M117 Printing..."
+            "default_value": "M280 P0 S160 ; release BLTouch alarm (OK to send for Non BLTouch)\nM420 Z2 ; set fade leveling at 2mm for BLTouch (OK to send for Non BLTouch)\nG28 ; home all\nG29 ; probe bed\nG92 E0 ;zero the extruded length\nG1 X0.0 Y50.0 Z10.0 F3600\n; perform wipe and prime\nG1 Z0.0 F1000\nG1 Z0.2 Y70.0 E9.0 F1000.0 ; prime\nG1 Y100.0 E12.5 F1000.0 ; prime\nG92 E0 ; zero extruder again\nM117 Printing..."
         },
         "machine_end_gcode": {
-            "default_value": "G92 E0 ; zero the extruded length again\G1 E-1.5 F500 ; retract the filament to release some of the pressure\M104 S0 ; turn off extruder\M140 S0 ; turn off bed\G28 X0 ; home X axis\G1 Y245 ; move Y axis to end position\M84 ; disable motors\M107 ; turn off fan"
+            "default_value": "G92 E0 ; zero the extruded length again\nG1 E-1.5 F500 ; retract the filament to release some of the pressure\nM104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nG28 X0 ; home X axis\nG1 Y245 ; move Y axis to end position\nM84 ; disable motors\nM107 ; turn off fan"
         }
     }
 }