diff --git a/Marlin/pins_MEGATRONICS_3.h b/Marlin/pins_MEGATRONICS_3.h
index aa6c40374f147d78cf29c9957b4cf62679dc7ebc..5e4ca4b5864308380b234777068293d934682201 100644
--- a/Marlin/pins_MEGATRONICS_3.h
+++ b/Marlin/pins_MEGATRONICS_3.h
@@ -143,11 +143,14 @@
 #define BTN_ENC            33
 
 #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
+
   #define LCD_PINS_RS      56 // CS chip select / SS chip slave select
   #define LCD_PINS_ENABLE  51 // SID (MOSI)
   #define LCD_PINS_D4      52 // SCK (CLK) clock
   #define SD_DETECT_PIN    35
+
 #else
+
   #define LCD_PINS_RS      32
   #define LCD_PINS_ENABLE  31
   #define LCD_PINS_D4      14
@@ -171,23 +174,23 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#if DISABLED(REPRAPWORLD_KEYPAD)     // try to use the keypad connector first
-  #define SPINDLE_LASER_PWM_PIN         44  // MUST BE HARDWARE PWM
-  #define SPINDLE_LASER_ENABLE_PIN      43  // Pin should have a pullup!
-  #define SPINDLE_DIR_PIN               42
+#if DISABLED(REPRAPWORLD_KEYPAD)       // try to use the keypad connector first
+  #define SPINDLE_LASER_PWM_PIN    44  // MUST BE HARDWARE PWM
+  #define SPINDLE_LASER_ENABLE_PIN 43  // Pin should have a pullup!
+  #define SPINDLE_DIR_PIN          42
 #elif EXTRUDERS <= 2
-  // try to hijack the last extruder so that we can get the PWM signal off the Y breakout
-  // move all the Y signals to the E2 extruder socket - makes dual Y steppers harder
-  #undef Y_ENABLE_PIN
-  #undef Y_STEP_PIN
-  #undef Y_DIR_PIN
-  #undef E2_STEP_PIN
-  #undef E2_ENABLE_PIN
-  #undef E2_DIR_PIN
-  #define Y_ENABLE_PIN          23
-  #define Y_STEP_PIN            22
-  #define Y_DIR_PIN             60
-  #define SPINDLE_LASER_PWM_PIN          4  // MUST BE HARDWARE PWM
-  #define SPINDLE_LASER_ENABLE_PIN      17  // Pin should have a pullup!
-  #define SPINDLE_DIR_PIN                5
+  // Hijack the last extruder so that we can get the PWM signal off the Y breakout
+  // Move Y to the E2 plug. This makes dual Y steppers harder
+  #undef Y_ENABLE_PIN  //  4
+  #undef Y_STEP_PIN    //  5
+  #undef Y_DIR_PIN     // 17
+  #undef E2_ENABLE_PIN // 23
+  #undef E2_STEP_PIN   // 22
+  #undef E2_DIR_PIN    // 60
+  #define Y_ENABLE_PIN             23
+  #define Y_STEP_PIN               22
+  #define Y_DIR_PIN                60
+  #define SPINDLE_LASER_PWM_PIN     4  // MUST BE HARDWARE PWM
+  #define SPINDLE_LASER_ENABLE_PIN 17  // Pin should have a pullup!
+  #define SPINDLE_DIR_PIN           5
 #endif