diff --git a/fluidd.cfg b/fluidd.cfg
index eee2dd9..382e149 100644
--- a/fluidd.cfg
+++ b/fluidd.cfg
@@ -5,66 +5,3 @@ path: /home/pi/gcode_files
 
 [display_status]
 
-[gcode_macro CANCEL_PRINT]
-description: Cancel the actual running print
-rename_existing: CANCEL_PRINT_BASE
-gcode:
-    TURN_OFF_HEATERS
-    CANCEL_PRINT_BASE
-
-[gcode_macro PAUSE]
-description: Pause the actual running print
-rename_existing: PAUSE_BASE
-# change this if you need more or less extrusion
-variable_extrude: 1.0
-gcode:
-    ##### read E from pause macro #####
-    {% set E = printer["gcode_macro PAUSE"].extrude|float %}
-    ##### set park positon for x and y #####
-    # default is your max posion from your printer.cfg
-    {% set x_park = printer.toolhead.axis_maximum.x|float - 5.0 %}
-    {% set y_park = printer.toolhead.axis_maximum.y|float - 5.0 %}
-    ##### calculate save lift position #####
-    {% set max_z = printer.toolhead.axis_maximum.z|float %}
-    {% set act_z = printer.toolhead.position.z|float %}
-    {% if act_z < (max_z - 2.0) %}
-        {% set z_safe = 2.0 %}
-    {% else %}
-        {% set z_safe = max_z - act_z %}
-    {% endif %}
-    ##### end of definitions #####
-    PAUSE_BASE
-    G91
-    {% if printer.extruder.can_extrude|lower == 'true' %}
-      G1 E-{E} F2100
-    {% else %}
-      {action_respond_info("Extruder not hot enough")}
-    {% endif %}
-    {% if "xyz" in printer.toolhead.homed_axes %}
-      G1 Z{z_safe} F900
-      G90
-      G1 X{x_park} Y{y_park} F6000
-    {% else %}
-      {action_respond_info("Printer not homed")}
-    {% endif %} 
-    
-[gcode_macro RESUME]
-description: Resume the actual running print
-rename_existing: RESUME_BASE
-gcode:
-    ##### read E from pause macro #####
-    {% set E = printer["gcode_macro PAUSE"].extrude|float %}
-    #### get VELOCITY parameter if specified ####
-    {% if 'VELOCITY' in params|upper %}
-      {% set get_params = ('VELOCITY=' + params.VELOCITY)  %}
-    {%else %}
-      {% set get_params = "" %}
-    {% endif %}
-    ##### end of definitions #####
-    {% if printer.extruder.can_extrude|lower == 'true' %}
-      G91
-      G1 E{E} F2100
-    {% else %}
-      {action_respond_info("Extruder not hot enough")}
-    {% endif %}  
-    RESUME_BASE {get_params}
\ No newline at end of file
diff --git a/macros.cfg b/macros.cfg
index e6fed9e..d8050b1 100644
--- a/macros.cfg
+++ b/macros.cfg
@@ -7,6 +7,70 @@ gcode:
   G0 X150 Y150 Z30 F3600
 
 
+[gcode_macro CANCEL_PRINT]
+description: Cancel the actual running print
+rename_existing: CANCEL_PRINT_BASE
+gcode:
+    TURN_OFF_HEATERS
+    CANCEL_PRINT_BASE
+
+[gcode_macro PAUSE]
+description: Pause the actual running print
+rename_existing: PAUSE_BASE
+# change this if you need more or less extrusion
+variable_extrude: 1.0
+gcode:
+    # read E from pause macro
+    {% set E = printer["gcode_macro PAUSE"].extrude|float %}
+    # set park positon for x and y
+    {% set x_park = printer.toolhead.axis_maximum.x|float - 5.0 %}
+    {% set y_park = printer.toolhead.axis_maximum.y|float - 5.0 %}
+    # calculate save lift position
+    {% set max_z = printer.toolhead.axis_maximum.z|float %}
+    {% set act_z = printer.toolhead.position.z|float %}
+    {% if act_z < (max_z - 2.0) %}
+        {% set z_safe = 2.0 %}
+    {% else %}
+        {% set z_safe = max_z - act_z %}
+    {% endif %}
+    # end of definitions
+    PAUSE_BASE
+    G91
+    {% if printer.extruder.can_extrude|lower == 'true' %}
+      G1 E-{E} F2100
+    {% else %}
+      {action_respond_info("Extruder not hot enough")}
+    {% endif %}
+    {% if "xyz" in printer.toolhead.homed_axes %}
+      G1 Z{z_safe} F900
+      G90
+      G1 X{x_park} Y{y_park} F6000
+    {% else %}
+      {action_respond_info("Printer not homed")}
+    {% endif %}
+
+[gcode_macro RESUME]
+description: Resume the actual running print
+rename_existing: RESUME_BASE
+gcode:
+    # read E from pause macro
+    {% set E = printer["gcode_macro PAUSE"].extrude|float %}
+    # get VELOCITY parameter if specified
+    {% if 'VELOCITY' in params|upper %}
+      {% set get_params = ('VELOCITY=' + params.VELOCITY)  %}
+    {%else %}
+      {% set get_params = "" %}
+    {% endif %}
+    # end of definitions
+    {% if printer.extruder.can_extrude|lower == 'true' %}
+      G91
+      G1 E{E} F2100
+    {% else %}
+      {action_respond_info("Extruder not hot enough")}
+    {% endif %}
+    RESUME_BASE {get_params}
+
+
 [gcode_macro FILAMENT_UNLOAD]
 description: unload filament
 gcode: