diff --git a/Marlin/pinsDebug_Teensyduino.h b/Marlin/pinsDebug_Teensyduino.h
index 797a2cd71..3e08bbbc6 100644
--- a/Marlin/pinsDebug_Teensyduino.h
+++ b/Marlin/pinsDebug_Teensyduino.h
@@ -29,7 +29,7 @@
 #define __PINSDEBUG_TEENSYDUINO_H__
 
 #undef NUM_DIGITAL_PINS
-#define NUM_DIGITAL_PINS 48  // Teensy says 46 but FASTIO is 48
+#define NUM_DIGITAL_PINS 48   // Teensy says 46 but FASTIO is 48
 
 // "digitalPinToPort" function just returns the pin number so need to create our own.
 // Can't use the name "digitalPinToPort" for our own because it interferes with the
@@ -42,7 +42,6 @@
 #define PE 5
 #define PF 6
 
-
 const uint8_t PROGMEM digital_pin_to_port_PGM_Teensy[] = {
   PD, // 0  - PD0 - INT0 - PWM
   PD, // 1  - PD1 - INT1 - PWM
diff --git a/Marlin/pins_3DRAG.h b/Marlin/pins_3DRAG.h
index feadea4e3..61cdb56c1 100644
--- a/Marlin/pins_3DRAG.h
+++ b/Marlin/pins_3DRAG.h
@@ -153,11 +153,11 @@
     #define Z_DIR_PIN                28
     #define Z_ENABLE_PIN             24
     #define Z_STEP_PIN               26
-    #define SPINDLE_LASER_PWM_PIN    46  // MUST BE HARDWARE PWM
-    #define SPINDLE_LASER_ENABLE_PIN 62  // Pin should have a pullup!
+    #define SPINDLE_LASER_PWM_PIN    46   // MUST BE HARDWARE PWM
+    #define SPINDLE_LASER_ENABLE_PIN 62   // Pin should have a pullup!
     #define SPINDLE_DIR_PIN          48
   #elif !(ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)) // use expansion header if no LCD in use
-    #define SPINDLE_LASER_ENABLE_PIN 16  // Pin should have a pullup/pulldown!
+    #define SPINDLE_LASER_ENABLE_PIN 16   // Pin should have a pullup/pulldown!
     #define SPINDLE_DIR_PIN          17
   #endif
 #endif
diff --git a/Marlin/pins_5DPRINT.h b/Marlin/pins_5DPRINT.h
index 266fde32d..0e8b5f601 100755
--- a/Marlin/pins_5DPRINT.h
+++ b/Marlin/pins_5DPRINT.h
@@ -140,4 +140,4 @@
 #define SDSS               20   // B0
 
 //DIGIPOTS slave addresses
-#define DIGIPOT_I2C_ADDRESS_A 0x2C  // unshifted slave address for DIGIPOT 0x2C (0x58 <- 0x2C << 1)
+#define DIGIPOT_I2C_ADDRESS_A 0x2C   // unshifted slave address for DIGIPOT 0x2C (0x58 <- 0x2C << 1)
diff --git a/Marlin/pins_ANET_10.h b/Marlin/pins_ANET_10.h
index 2ab92a3d9..d7c113d35 100644
--- a/Marlin/pins_ANET_10.h
+++ b/Marlin/pins_ANET_10.h
@@ -125,14 +125,14 @@
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          7  // Analog Input (pin 33 extruder)
-#define TEMP_BED_PIN        6  // Analog Input (pin 34 bed)
+#define TEMP_0_PIN          7   // Analog Input (pin 33 extruder)
+#define TEMP_BED_PIN        6   // Analog Input (pin 34 bed)
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       13  // (extruder)
-#define HEATER_BED_PIN     12  // (bed)
+#define HEATER_0_PIN       13   // (extruder)
+#define HEATER_BED_PIN     12   // (bed)
 #define FAN_PIN             4
 
 //
diff --git a/Marlin/pins_AZTEEG_X3.h b/Marlin/pins_AZTEEG_X3.h
index 86ccbd924..0abc9b87d 100644
--- a/Marlin/pins_AZTEEG_X3.h
+++ b/Marlin/pins_AZTEEG_X3.h
@@ -32,8 +32,8 @@
   #error "Azteeg X3 supports up to 2 hotends / E-steppers. Comment out this line to continue."
 #endif
 
-#if ENABLED(CASE_LIGHT_ENABLE)  && !PIN_EXISTS(CASE_LIGHT)
-  #define CASE_LIGHT_PIN 6     // must define it here or else RAMPS will define it
+#if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT)
+  #define CASE_LIGHT_PIN    6   // Define before RAMPS pins include
 #endif
 #define BOARD_NAME "Azteeg X3"
 
@@ -44,8 +44,8 @@
 //
 #undef SERVO0_PIN
 #undef SERVO1_PIN
-#define SERVO0_PIN  44  // SERVO1 port
-#define SERVO1_PIN  55  // SERVO2 port
+#define SERVO0_PIN         44   // SERVO1 port
+#define SERVO1_PIN         55   // SERVO2 port
 
 //
 // LCD / Controller
@@ -91,9 +91,9 @@
   #undef SCL
   #if SERVO0_PIN == 7
     #undef SERVO0_PIN
-    #def SERVO0_PIN 11
+    #define SERVO0_PIN     11
   #endif
-  #define SPINDLE_LASER_PWM_PIN     7  // MUST BE HARDWARE PWM
-  #define SPINDLE_LASER_ENABLE_PIN 20  // Pin should have a pullup!
+  #define SPINDLE_LASER_PWM_PIN     7   // MUST BE HARDWARE PWM
+  #define SPINDLE_LASER_ENABLE_PIN 20   // Pin should have a pullup!
   #define SPINDLE_DIR_PIN          21
 #endif
diff --git a/Marlin/pins_AZTEEG_X3_PRO.h b/Marlin/pins_AZTEEG_X3_PRO.h
index 159cd0f76..101032067 100644
--- a/Marlin/pins_AZTEEG_X3_PRO.h
+++ b/Marlin/pins_AZTEEG_X3_PRO.h
@@ -28,11 +28,10 @@
   #error "Azteeg X3 Pro supports up to 5 hotends / E-steppers. Comment out this line to continue."
 #endif
 
-#if ENABLED(CASE_LIGHT_ENABLE)  && !PIN_EXISTS(CASE_LIGHT)
-  #define CASE_LIGHT_PIN 44     // must define it here or else RAMPS will define it
+#if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT)
+  #define CASE_LIGHT_PIN 44     // Define before RAMPS pins include
 #endif
 
-
 #define BOARD_NAME "Azteeg X3 Pro"
 
 #include "pins_RAMPS.h"
@@ -42,8 +41,8 @@
 #endif
 
 // DIGIPOT slave addresses
-#define DIGIPOT_I2C_ADDRESS_A 0x2C  // unshifted slave address for first DIGIPOT 0x2C (0x58 <- 0x2C << 1)
-#define DIGIPOT_I2C_ADDRESS_B 0x2E  // unshifted slave address for second DIGIPOT 0x2E (0x5C <- 0x2E << 1)
+#define DIGIPOT_I2C_ADDRESS_A 0x2C   // unshifted slave address for first DIGIPOT 0x2C (0x58 <- 0x2C << 1)
+#define DIGIPOT_I2C_ADDRESS_B 0x2E   // unshifted slave address for second DIGIPOT 0x2E (0x5C <- 0x2E << 1)
 
 //
 // Servos
@@ -118,10 +117,10 @@
 #define HEATER_7_PIN       11
 
 #undef FAN_PIN
-#define FAN_PIN             6 // Part Cooling System
+#define FAN_PIN             6   // Part Cooling System
 
 #ifndef CONTROLLER_FAN_PIN
-  #define CONTROLLER_FAN_PIN 4 // Pin used for the fan to cool motherboard (-1 to disable)
+  #define CONTROLLER_FAN_PIN 4   // Pin used for the fan to cool motherboard (-1 to disable)
 #endif
 
 // Fans/Water Pump to cool the hotend cool side.
@@ -150,9 +149,9 @@
 // Misc. Functions
 //
 #if ENABLED(CASE_LIGHT_ENABLE)  && PIN_EXISTS(CASE_LIGHT) && defined(DOGLCD_A0) && DOGLCD_A0 == CASE_LIGHT_PIN
-  #undef DOGLCD_A0            // Steal pin 44 for the case light; if you have a Viki2 and have connected it
-  #define DOGLCD_A0        57 // following the Panucatt wiring diagram, you may need to tweak these pin assignments
-                              // as the wiring diagram uses pin 44 for DOGLCD_A0
+  #undef DOGLCD_A0              // Steal pin 44 for the case light; if you have a Viki2 and have connected it
+  #define DOGLCD_A0        57   // following the Panucatt wiring diagram, you may need to tweak these pin assignments
+                                // as the wiring diagram uses pin 44 for DOGLCD_A0
 #endif
 
 //
@@ -162,13 +161,13 @@
 #undef SPINDLE_LASER_ENABLE_PIN
 #undef SPINDLE_DIR_PIN
 
-#if ENABLED(SPINDLE_LASER_ENABLE)   // use EXP2 header
+#if ENABLED(SPINDLE_LASER_ENABLE)   // EXP2 header
   #if ENABLED(VIKI2) || ENABLED(miniVIKI)
     #undef BTN_EN2
-    #define BTN_EN2             31  // need 7 for the spindle speed PWM
+    #define BTN_EN2             31   // need 7 for the spindle speed PWM
   #endif
-  #define SPINDLE_LASER_PWM_PIN     7  // must have a hardware PWM
-  #define SPINDLE_LASER_ENABLE_PIN 20  // Pin should have a pullup!
+  #define SPINDLE_LASER_PWM_PIN     7   // must have a hardware PWM
+  #define SPINDLE_LASER_ENABLE_PIN 20   // Pin should have a pullup!
   #define SPINDLE_DIR_PIN          21
 #endif
 
diff --git a/Marlin/pins_BAM_DICE_DUE.h b/Marlin/pins_BAM_DICE_DUE.h
index 2b34cddd8..d763392c5 100644
--- a/Marlin/pins_BAM_DICE_DUE.h
+++ b/Marlin/pins_BAM_DICE_DUE.h
@@ -33,9 +33,9 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_ENABLE_PIN 66  // Pin should have a pullup/pulldown!
+#define SPINDLE_LASER_ENABLE_PIN 66   // Pin should have a pullup/pulldown!
 #define SPINDLE_DIR_PIN          67
-#define SPINDLE_LASER_PWM_PIN    44  // MUST BE HARDWARE PWM
+#define SPINDLE_LASER_PWM_PIN    44   // MUST BE HARDWARE PWM
 
 #include "pins_RAMPS.h"
 
diff --git a/Marlin/pins_BQ_ZUM_MEGA_3D.h b/Marlin/pins_BQ_ZUM_MEGA_3D.h
index f20f9b54d..f80379eda 100644
--- a/Marlin/pins_BQ_ZUM_MEGA_3D.h
+++ b/Marlin/pins_BQ_ZUM_MEGA_3D.h
@@ -49,13 +49,13 @@
 //
 // Misc. Functions
 //
-#define CASE_LIGHT_PIN   44     // MUST BE HARDWARE PWM
+#define CASE_LIGHT_PIN     44   // MUST BE HARDWARE PWM
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_ENABLE_PIN 40  // Pin should have a pullup/pulldown!
-#define SPINDLE_LASER_PWM_PIN    44  // MUST BE HARDWARE PWM
+#define SPINDLE_LASER_ENABLE_PIN 40   // Pin should have a pullup/pulldown!
+#define SPINDLE_LASER_PWM_PIN    44   // MUST BE HARDWARE PWM
 #define SPINDLE_DIR_PIN          42
 
 #include "pins_RAMPS_13.h"
@@ -64,16 +64,16 @@
 // Limit Switches
 //
 #undef X_MAX_PIN
-#define X_MAX_PIN         79 // 2
+#define X_MAX_PIN         79   // 2
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #undef Z_MIN_PROBE_PIN
-#define Z_MIN_PROBE_PIN   19 // IND_S_5V
+#define Z_MIN_PROBE_PIN   19   // IND_S_5V
 
 #undef Z_ENABLE_PIN
-#define Z_ENABLE_PIN      77 // 62
+#define Z_ENABLE_PIN      77   // 62
 
 //
 // Steppers
@@ -93,8 +93,8 @@
 //
 // Misc. Functions
 //
-#undef PS_ON_PIN             // 12
-#define PS_ON_PIN         81 // External Power Supply
+#undef PS_ON_PIN               // 12
+#define PS_ON_PIN         81   // External Power Supply
 
 
 // This board has headers for Z-min, Z-max and IND_S_5V *but* as the bq team
@@ -104,8 +104,8 @@
 #ifdef Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
   #undef Z_MIN_PIN
   #undef Z_MAX_PIN
-  #define Z_MIN_PIN       19 // IND_S_5V
-  #define Z_MAX_PIN       18 // Z-MIN Label
+  #define Z_MIN_PIN       19   // IND_S_5V
+  #define Z_MAX_PIN       18   // Z-MIN Label
 #endif
 
 
diff --git a/Marlin/pins_CNCONTROLS_11.h b/Marlin/pins_CNCONTROLS_11.h
index 265d1b6aa..8535288ec 100644
--- a/Marlin/pins_CNCONTROLS_11.h
+++ b/Marlin/pins_CNCONTROLS_11.h
@@ -65,7 +65,7 @@
 #define HEATER_3_PIN       46
 #define HEATER_BED_PIN      2
 
-//#define FAN_PIN           7  // common PWM pin for all tools
+//#define FAN_PIN           7   // common PWM pin for all tools
 
 #define ORIG_E0_AUTO_FAN_PIN 7
 #define ORIG_E1_AUTO_FAN_PIN 7
@@ -84,7 +84,7 @@
 //#define TOOL_1_PIN          59
 //#define TOOL_2_PIN           8
 //#define TOOL_3_PIN          30
-//#define TOOL_PWM_PIN         7  // common PWM pin for all tools
+//#define TOOL_PWM_PIN         7   // common PWM pin for all tools
 
 // Common I/O
 
diff --git a/Marlin/pins_CNCONTROLS_12.h b/Marlin/pins_CNCONTROLS_12.h
index 5cf462a94..9a849916f 100644
--- a/Marlin/pins_CNCONTROLS_12.h
+++ b/Marlin/pins_CNCONTROLS_12.h
@@ -65,7 +65,7 @@
 #define HEATER_3_PIN        3
 #define HEATER_BED_PIN     24
 
-#define FAN_PIN             5  // 5 is PWMtool3 -> 7 is common PWM pin for all tools
+#define FAN_PIN             5   // 5 is PWMtool3 -> 7 is common PWM pin for all tools
 
 #define ORIG_E0_AUTO_FAN_PIN 7
 #define ORIG_E1_AUTO_FAN_PIN 7
@@ -81,9 +81,9 @@
 // Tools
 
 //#define TOOL_0_PIN         56
-//#define TOOL_0_PWM_PIN     10  // red warning led at dual extruder
+//#define TOOL_0_PWM_PIN     10   // red warning led at dual extruder
 //#define TOOL_1_PIN         59
-//#define TOOL_1_PWM_PIN      8  // lights at dual extruder
+//#define TOOL_1_PWM_PIN      8   // lights at dual extruder
 //#define TOOL_2_PIN          4
 //#define TOOL_2_PWM_PIN      5
 //#define TOOL_3_PIN         14
diff --git a/Marlin/pins_EINSY_RAMBO.h b/Marlin/pins_EINSY_RAMBO.h
index c6da8ea65..c8d86ad00 100644
--- a/Marlin/pins_EINSY_RAMBO.h
+++ b/Marlin/pins_EINSY_RAMBO.h
@@ -71,8 +71,8 @@
   #define Y_MIN_PIN          Y_DIAG_PIN
 
   #if ENABLED(BLTOUCH)
-    #define Z_MIN_PIN        11 // Y-MIN
-    #define SERVO0_PIN       10 // Z-MIN
+    #define Z_MIN_PIN        11   // Y-MIN
+    #define SERVO0_PIN       10   // Z-MIN
   #else
     #define Z_MIN_PIN        10
   #endif
@@ -152,8 +152,8 @@
 // M3/M4/M5 - Spindle/Laser Control
 //
 // use P1 connector for spindle pins
-#define SPINDLE_LASER_PWM_PIN     9  // MUST BE HARDWARE PWM
-#define SPINDLE_LASER_ENABLE_PIN 18  // Pin should have a pullup!
+#define SPINDLE_LASER_PWM_PIN     9   // MUST BE HARDWARE PWM
+#define SPINDLE_LASER_ENABLE_PIN 18   // Pin should have a pullup!
 #define SPINDLE_DIR_PIN          19
 
 //
@@ -161,7 +161,7 @@
 //
 #define E_MUX0_PIN         17
 #define E_MUX1_PIN         16
-#define E_MUX2_PIN         78  // 84 in MK2 Firmware, with BEEPER as 78
+#define E_MUX2_PIN         78   // 84 in MK2 Firmware, with BEEPER as 78
 
 //
 // LCD / Controller
@@ -189,8 +189,8 @@
       #define BTN_EN2         72
     #endif
 
-    #define BTN_ENC            9  // AUX-2
-    #define BEEPER_PIN        84  // AUX-4
+    #define BTN_ENC            9   // AUX-2
+    #define BEEPER_PIN        84   // AUX-4
     #define SD_DETECT_PIN     15
 
   #endif // NEWPANEL
diff --git a/Marlin/pins_ELEFU_3.h b/Marlin/pins_ELEFU_3.h
index 51bd07864..12631a901 100644
--- a/Marlin/pins_ELEFU_3.h
+++ b/Marlin/pins_ELEFU_3.h
@@ -85,18 +85,18 @@
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       45 // 12V PWM1
-#define HEATER_1_PIN       46 // 12V PWM2
-#define HEATER_2_PIN       17 // 12V PWM3
-#define HEATER_BED_PIN     44 // DOUBLE 12V PWM
+#define HEATER_0_PIN       45   // 12V PWM1
+#define HEATER_1_PIN       46   // 12V PWM2
+#define HEATER_2_PIN       17   // 12V PWM3
+#define HEATER_BED_PIN     44   // DOUBLE 12V PWM
 
-#define FAN_PIN            16 // 5V PWM
+#define FAN_PIN            16   // 5V PWM
 
 //
 // Misc. Functions
 //
-#define PS_ON_PIN          10 // Set to -1 if using a manual switch on the PWRSW Connector
-#define SLEEP_WAKE_PIN     26 // This feature still needs work
+#define PS_ON_PIN          10   // Set to -1 if using a manual switch on the PWRSW Connector
+#define SLEEP_WAKE_PIN     26   // This feature still needs work
 #define PHOTOGRAPH_PIN     29
 
 //
@@ -122,28 +122,28 @@
   #define TLC_XLAT_PIN     22
   #define TLC_DATA_PIN     24
 
-  // We also need to define pin to port number mapping for the 2560 to match the pins listed above. If you change the TLC pins, update this as well per the 2560 datasheet!
-  // This currently only works with the RA Board.
-  #define TLC_CLOCK_BIT 3 // bit 3 on port A
-  #define TLC_CLOCK_PORT &PORTA // bit 3 on port A
+  // We also need to define pin to port number mapping for the 2560 to match the pins listed above.
+  // If you change the TLC pins, update this as well per the 2560 datasheet! This currently only works with the RA Board.
+  #define TLC_CLOCK_BIT     3
+  #define TLC_CLOCK_PORT    &PORTA
 
-  #define TLC_BLANK_BIT 1 // bit 1 on port A
-  #define TLC_BLANK_PORT &PORTA // bit 1 on port A
+  #define TLC_BLANK_BIT     1
+  #define TLC_BLANK_PORT    &PORTA
 
-  #define TLC_DATA_BIT 2 // bit 2 on port A
-  #define TLC_DATA_PORT &PORTA // bit 2 on port A
+  #define TLC_DATA_BIT      2
+  #define TLC_DATA_PORT     &PORTA
 
-  #define TLC_XLAT_BIT 0 // bit 0 on port A
-  #define TLC_XLAT_PORT &PORTA // bit 0 on port A
+  #define TLC_XLAT_BIT      0
+  #define TLC_XLAT_PORT     &PORTA
 
-  // change this to match your situation. Lots of TLCs takes up the arduino SRAM very quickly, so be careful
+  // Change this to match your situation. Lots of TLCs takes up the arduino SRAM very quickly, so be careful
   // Leave it at at least 1 if you have enabled RA_LIGHTING
   // The number of TLC5947 boards chained together for use with the animation, additional ones will repeat the animation on them, but are not individually addressable and mimic those before them. You can leave the default at 2 even if you only have 1 TLC5947 module.
-  #define NUM_TLCS 2
+  #define NUM_TLCS          2
 
   // These TRANS_ARRAY values let you change the order the LEDs on the lighting modules will animate for chase functions.
   // Modify them according to your specific situation.
   // NOTE: the array should be 8 long for every TLC you have. These defaults assume (2) TLCs.
-  #define TRANS_ARRAY {0, 1, 2, 3, 4, 5, 6, 7, 15, 14, 13, 12, 11, 10, 9, 8} //forwards
-  //#define TRANS_ARRAY {7, 6, 5, 4, 3, 2, 1, 0, 8, 9, 10, 11, 12, 13, 14, 15} //backwards
+  #define TRANS_ARRAY { 0, 1, 2, 3, 4, 5, 6, 7, 15, 14, 13, 12, 11, 10, 9, 8 }    // forward
+  //#define TRANS_ARRAY { 7, 6, 5, 4, 3, 2, 1, 0, 8, 9, 10, 11, 12, 13, 14, 15 }  // backward
 #endif // RA_DISCO
diff --git a/Marlin/pins_GEN7_12.h b/Marlin/pins_GEN7_12.h
index b0f178ff3..3bc38d7ee 100644
--- a/Marlin/pins_GEN7_12.h
+++ b/Marlin/pins_GEN7_12.h
@@ -60,7 +60,7 @@
 #endif
 
 #ifndef GEN7_VERSION
-  #define GEN7_VERSION 12 // v1.x
+  #define GEN7_VERSION 12   // v1.x
 #endif
 
 //
@@ -122,9 +122,9 @@
 #define PS_ON_PIN          15
 
 #if GEN7_VERSION < 13
-  #define CASE_LIGHT_PIN   16     // MUST BE HARDWARE PWM
+  #define CASE_LIGHT_PIN   16   // MUST BE HARDWARE PWM
 #else     // Gen7 v1.3 removed the I2C connector & signals so need to get PWM off the PC power supply header
-  #define CASE_LIGHT_PIN   15     // MUST BE HARDWARE PWM
+  #define CASE_LIGHT_PIN   15   // MUST BE HARDWARE PWM
 #endif
 
 // All these generations of Gen7 supply thermistor power
@@ -140,10 +140,10 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_ENABLE_PIN 10  // Pin should have a pullup/pulldown!
+#define SPINDLE_LASER_ENABLE_PIN 10   // Pin should have a pullup/pulldown!
 #define SPINDLE_DIR_PIN          11
 #if GEN7_VERSION < 13
-  #define SPINDLE_LASER_PWM_PIN  16  // MUST BE HARDWARE PWM
+  #define SPINDLE_LASER_PWM_PIN  16   // MUST BE HARDWARE PWM
 #else  // Gen7 v1.3 removed the I2C connector & signals so need to get PWM off the PC power supply header
-  #define SPINDLE_LASER_PWM_PIN  15  // MUST BE HARDWARE PWM
+  #define SPINDLE_LASER_PWM_PIN  15   // MUST BE HARDWARE PWM
 #endif
diff --git a/Marlin/pins_GEN7_13.h b/Marlin/pins_GEN7_13.h
index 03ea131f4..749a6c338 100644
--- a/Marlin/pins_GEN7_13.h
+++ b/Marlin/pins_GEN7_13.h
@@ -51,5 +51,5 @@
 
 #define BOARD_NAME "Gen7 v1.3"
 
-#define GEN7_VERSION 13 // v1.3
+#define GEN7_VERSION 13   // v1.3
 #include "pins_GEN7_12.h"
diff --git a/Marlin/pins_GEN7_14.h b/Marlin/pins_GEN7_14.h
index 9d4e16af3..dedd227ca 100644
--- a/Marlin/pins_GEN7_14.h
+++ b/Marlin/pins_GEN7_14.h
@@ -57,7 +57,7 @@
 
 #define BOARD_NAME "Gen7 v1.4"
 
-#define GEN7_VERSION 14 // v1.4
+#define GEN7_VERSION 14   // v1.4
 
 //
 // Limit switches
@@ -113,6 +113,6 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_ENABLE_PIN 20  // Pin should have a pullup/pulldown!
-#define SPINDLE_LASER_PWM_PIN    16  // MUST BE HARDWARE PWM
+#define SPINDLE_LASER_ENABLE_PIN 20   // Pin should have a pullup/pulldown!
+#define SPINDLE_LASER_PWM_PIN    16   // MUST BE HARDWARE PWM
 #define SPINDLE_DIR_PIN          21
diff --git a/Marlin/pins_GEN7_CUSTOM.h b/Marlin/pins_GEN7_CUSTOM.h
index d64e94e2d..fdfb6b5fa 100644
--- a/Marlin/pins_GEN7_CUSTOM.h
+++ b/Marlin/pins_GEN7_CUSTOM.h
@@ -133,6 +133,6 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_ENABLE_PIN  5  // Pin should have a pullup/pulldown!
-#define SPINDLE_LASER_PWM_PIN    16  // MUST BE HARDWARE PWM
+#define SPINDLE_LASER_ENABLE_PIN  5   // Pin should have a pullup/pulldown!
+#define SPINDLE_LASER_PWM_PIN    16   // MUST BE HARDWARE PWM
 #define SPINDLE_DIR_PIN           6
diff --git a/Marlin/pins_GT2560_REV_A.h b/Marlin/pins_GT2560_REV_A.h
index cb4892015..73b32bb40 100644
--- a/Marlin/pins_GT2560_REV_A.h
+++ b/Marlin/pins_GT2560_REV_A.h
@@ -90,7 +90,7 @@
 #define SDSS               53
 #define LED_PIN            13
 #define PS_ON_PIN          12
-#define SUICIDE_PIN        54  // Must be enabled at startup to keep power flowing
+#define SUICIDE_PIN        54   // Must be enabled at startup to keep power flowing
 #define KILL_PIN           -1
 
 #if ENABLED(ULTRA_LCD)
diff --git a/Marlin/pins_MEGACONTROLLER.h b/Marlin/pins_MEGACONTROLLER.h
index f5660547a..b2631901b 100644
--- a/Marlin/pins_MEGACONTROLLER.h
+++ b/Marlin/pins_MEGACONTROLLER.h
@@ -138,7 +138,7 @@
   // Pins for DOGM SPI LCD Support
   #define DOGLCD_A0        47
   #define DOGLCD_CS        45
-  #define LCD_BACKLIGHT_PIN 44  // backlight LED on PA3
+  #define LCD_BACKLIGHT_PIN 44   // backlight LED on PA3
 
   #define KILL_PIN         12
   // GLCD features
@@ -159,6 +159,6 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_PWM_PIN     6  // MUST BE HARDWARE PWM
-#define SPINDLE_LASER_ENABLE_PIN  7  // Pin should have a pullup!
+#define SPINDLE_LASER_PWM_PIN     6   // MUST BE HARDWARE PWM
+#define SPINDLE_LASER_ENABLE_PIN  7   // Pin should have a pullup!
 #define SPINDLE_DIR_PIN           8
diff --git a/Marlin/pins_MEGATRONICS.h b/Marlin/pins_MEGATRONICS.h
index 702cf9886..acf1da016 100644
--- a/Marlin/pins_MEGATRONICS.h
+++ b/Marlin/pins_MEGATRONICS.h
@@ -123,6 +123,6 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_PWM_PIN     3  // MUST BE HARDWARE PWM
-#define SPINDLE_LASER_ENABLE_PIN  4  // Pin should have a pullup!
+#define SPINDLE_LASER_PWM_PIN     3   // MUST BE HARDWARE PWM
+#define SPINDLE_LASER_ENABLE_PIN  4   // Pin should have a pullup!
 #define SPINDLE_DIR_PIN          11
diff --git a/Marlin/pins_MEGATRONICS_2.h b/Marlin/pins_MEGATRONICS_2.h
index 2609d2065..2ae436674 100644
--- a/Marlin/pins_MEGATRONICS_2.h
+++ b/Marlin/pins_MEGATRONICS_2.h
@@ -53,13 +53,13 @@
 #define X_DIR_PIN          27
 #define X_ENABLE_PIN       25
 
-#define Y_STEP_PIN          4 // A6
-#define Y_DIR_PIN          54 // A0
+#define Y_STEP_PIN          4   // A6
+#define Y_DIR_PIN          54   // A0
 #define Y_ENABLE_PIN        5
 
-#define Z_STEP_PIN         56 // A2
-#define Z_DIR_PIN          60 // A6
-#define Z_ENABLE_PIN       55 // A1
+#define Z_STEP_PIN         56   // A2
+#define Z_DIR_PIN          60   // A6
+#define Z_ENABLE_PIN       55   // A1
 
 #define E0_STEP_PIN        35
 #define E0_DIR_PIN         36
@@ -69,8 +69,8 @@
 #define E1_DIR_PIN         39
 #define E1_ENABLE_PIN      28
 
-#define E2_STEP_PIN        23 // ? schematic says 24
-#define E2_DIR_PIN         24 // ? schematic says 23
+#define E2_STEP_PIN        23   // ? schematic says 24
+#define E2_DIR_PIN         24   // ? schematic says 23
 #define E2_ENABLE_PIN      22
 
 //
@@ -138,6 +138,6 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_PWM_PIN          3  // MUST BE HARDWARE PWM
-#define SPINDLE_LASER_ENABLE_PIN      16  // Pin should have a pullup!
-#define SPINDLE_DIR_PIN               11
+#define SPINDLE_LASER_PWM_PIN     3   // MUST BE HARDWARE PWM
+#define SPINDLE_LASER_ENABLE_PIN 16   // Pin should have a pullup!
+#define SPINDLE_DIR_PIN          11
diff --git a/Marlin/pins_MEGATRONICS_3.h b/Marlin/pins_MEGATRONICS_3.h
index 7b66361d3..c638b2786 100644
--- a/Marlin/pins_MEGATRONICS_3.h
+++ b/Marlin/pins_MEGATRONICS_3.h
@@ -37,10 +37,10 @@
 //
 // Servos
 //
-#define SERVO0_PIN         46 // AUX3-6
-#define SERVO1_PIN         47 // AUX3-5
-#define SERVO2_PIN         48 // AUX3-4
-#define SERVO3_PIN         49 // AUX3-3
+#define SERVO0_PIN         46   // AUX3-6
+#define SERVO1_PIN         47   // AUX3-5
+#define SERVO2_PIN         48   // AUX3-4
+#define SERVO3_PIN         49   // AUX3-3
 
 //
 // Limit Switches
@@ -168,9 +168,9 @@
 //
 // 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!
+#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
   // Hijack the last extruder so that we can get the PWM signal off the Y breakout
@@ -184,7 +184,7 @@
   #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_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
diff --git a/Marlin/pins_MELZI_CREALITY.h b/Marlin/pins_MELZI_CREALITY.h
index da8ca1549..b42075b76 100644
--- a/Marlin/pins_MELZI_CREALITY.h
+++ b/Marlin/pins_MELZI_CREALITY.h
@@ -47,11 +47,11 @@
 #undef LCD_PINS_D7
 #undef FIL_RUNOUT_PIN
 
-#define LCD_SDSS           31 // Smart Controller SD card reader (rather than the Melzi)
-#define LCD_PINS_RS        28 // st9720 CS
-#define LCD_PINS_ENABLE    17 // st9720 DAT
-#define LCD_PINS_D4        30 // st9720 CLK
-#define FIL_RUNOUT_PIN     -1 // Uses Beeper/LED Pin Pulled to GND
+#define LCD_SDSS           31   // Smart Controller SD card reader (rather than the Melzi)
+#define LCD_PINS_RS        28   // ST9720 CS
+#define LCD_PINS_ENABLE    17   // ST9720 DAT
+#define LCD_PINS_D4        30   // ST9720 CLK
+#define FIL_RUNOUT_PIN     -1   // Uses Beeper/LED Pin Pulled to GND
 
 // Alter timing for graphical display
 #ifndef ST7920_DELAY_1
diff --git a/Marlin/pins_MELZI_MALYAN.h b/Marlin/pins_MELZI_MALYAN.h
index b11160f8e..3888b537d 100644
--- a/Marlin/pins_MELZI_MALYAN.h
+++ b/Marlin/pins_MELZI_MALYAN.h
@@ -35,12 +35,12 @@
 #undef BTN_EN2
 #undef BTN_ENC
 
-#define LCD_PINS_RS     17 // st9720 CS
-#define LCD_PINS_ENABLE 16 // st9720 DAT
-#define LCD_PINS_D4     11 // st9720 CLK
-#define BTN_EN1         30
-#define BTN_EN2         29
-#define BTN_ENC         28
+#define LCD_PINS_RS        17   // ST9720 CS
+#define LCD_PINS_ENABLE    16   // ST9720 DAT
+#define LCD_PINS_D4        11   // ST9720 CLK
+#define BTN_EN1            30
+#define BTN_EN2            29
+#define BTN_ENC            28
 
 // Alter timing for graphical display
 #ifndef ST7920_DELAY_1
diff --git a/Marlin/pins_MIGHTYBOARD_REVE.h b/Marlin/pins_MIGHTYBOARD_REVE.h
index 1e5e4f5f2..9a2fb539b 100644
--- a/Marlin/pins_MIGHTYBOARD_REVE.h
+++ b/Marlin/pins_MIGHTYBOARD_REVE.h
@@ -119,7 +119,7 @@
 #define DIGIPOTS_I2C_SDA_Z  65   // K3
 #define DIGIPOTS_I2C_SDA_E0 27   // A5
 #define DIGIPOTS_I2C_SDA_E1 77   // J6
-#define DIGIPOT_I2C_ADDRESS_A 0x2F  // unshifted slave address (5E <- 2F << 1)
+#define DIGIPOT_I2C_ADDRESS_A 0x2F   // unshifted slave address (5E <- 2F << 1)
 
 //
 // Temperature Sensors
@@ -267,9 +267,9 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_ENABLE_PIN 66  // K4   Pin should have a pullup!
-#define SPINDLE_LASER_PWM_PIN     8  // H5   MUST BE HARDWARE PWM
-#define SPINDLE_DIR_PIN          67  // K5
+#define SPINDLE_LASER_ENABLE_PIN 66   // K4   Pin should have a pullup!
+#define SPINDLE_LASER_PWM_PIN     8   // H5   MUST BE HARDWARE PWM
+#define SPINDLE_DIR_PIN          67   // K5
 
 
 
diff --git a/Marlin/pins_MINIRAMBO.h b/Marlin/pins_MINIRAMBO.h
index b326112e6..609c0c867 100644
--- a/Marlin/pins_MINIRAMBO.h
+++ b/Marlin/pins_MINIRAMBO.h
@@ -122,8 +122,8 @@
 // M3/M4/M5 - Spindle/Laser Control
 //
 // use P1 connector for spindle pins
-#define SPINDLE_LASER_PWM_PIN     9  // MUST BE HARDWARE PWM
-#define SPINDLE_LASER_ENABLE_PIN 18  // Pin should have a pullup!
+#define SPINDLE_LASER_PWM_PIN     9   // MUST BE HARDWARE PWM
+#define SPINDLE_LASER_ENABLE_PIN 18   // Pin should have a pullup!
 #define SPINDLE_DIR_PIN          19
 
 //
diff --git a/Marlin/pins_MINITRONICS.h b/Marlin/pins_MINITRONICS.h
index d3ff9edbb..fe2c9e0b5 100644
--- a/Marlin/pins_MINITRONICS.h
+++ b/Marlin/pins_MINITRONICS.h
@@ -130,13 +130,13 @@
 //
 #if ENABLED(SPINDLE_LASER_ENABLE)  // assumes we're only doing CNC work (no 3D printing)
   #undef HEATER_BED_PIN
-  #undef TEMP_BED_PIN           // need to free up some pins but also need to
-  #undef TEMP_0_PIN             // re-assign them (to unused pins) because Marlin
-  #undef TEMP_1_PIN             // requires the presence of certain pins or else it
-  #define HEATER_BED_PIN      4  // won't compile
+  #undef TEMP_BED_PIN             // need to free up some pins but also need to
+  #undef TEMP_0_PIN               // re-assign them (to unused pins) because Marlin
+  #undef TEMP_1_PIN               // requires the presence of certain pins or else it
+  #define HEATER_BED_PIN      4   // won't compile
   #define TEMP_BED_PIN       50
   #define TEMP_0_PIN         51
-  #define SPINDLE_LASER_ENABLE_PIN      52 // using A6 because it already has a pull up on it
-  #define SPINDLE_LASER_PWM_PIN          3 // WARNING - LED & resistor pull up to +12/+24V stepper voltage
+  #define SPINDLE_LASER_ENABLE_PIN      52   // using A6 because it already has a pullup
+  #define SPINDLE_LASER_PWM_PIN          3   // WARNING - LED & resistor pull up to +12/+24V stepper voltage
   #define SPINDLE_DIR_PIN               53
 #endif
diff --git a/Marlin/pins_MKS_BASE.h b/Marlin/pins_MKS_BASE.h
index dcf9b90f2..65c78e148 100644
--- a/Marlin/pins_MKS_BASE.h
+++ b/Marlin/pins_MKS_BASE.h
@@ -43,8 +43,8 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_PWM_PIN     2  // MUST BE HARDWARE PWM
-#define SPINDLE_LASER_ENABLE_PIN 15  // Pin should have a pullup!
+#define SPINDLE_LASER_PWM_PIN     2   // MUST BE HARDWARE PWM
+#define SPINDLE_LASER_ENABLE_PIN 15   // Pin should have a pullup!
 #define SPINDLE_DIR_PIN          19
 
 #include "pins_RAMPS.h"
diff --git a/Marlin/pins_MKS_BASE_HEROIC.h b/Marlin/pins_MKS_BASE_HEROIC.h
index 444d51503..4145327fc 100644
--- a/Marlin/pins_MKS_BASE_HEROIC.h
+++ b/Marlin/pins_MKS_BASE_HEROIC.h
@@ -34,13 +34,13 @@
  * the A4982 is doing quarter steps (MS1=L / MS2=H).
  */
 #define HEROIC_STEPPER_DRIVERS
-#define X_MS1_PIN            5  // Digital 3  / Pin 5   / PE3  / SERVO2_PIN
-#define X_MS2_PIN            6  // Digital 6  / Pin 14  / PH3  / SERVO1_PIN
-#define Y_MS1_PIN           59  // Analog 5   / Pin 92  / PF5
-#define Y_MS2_PIN           58  // Analog 4   / Pin 93  / PF4
-#define Z_MS1_PIN           22  // Digital 22 / Pin 78  / PA0
-#define Z_MS2_PIN           39  // Digital 39 / Pin 70  / PG2
-#define E0_MS1_PIN          63  // Analog 9   / Pin 86  / PK1
-#define E0_MS2_PIN          64  // Analog 10  / Pin 87  / PK2
-#define E1_MS1_PIN          57  // Analog 3   / Pin 93  / PF3
-#define E1_MS2_PIN           4  // Digital 4  / Pin 1   / PG5  / SERVO3_PIN
+#define X_MS1_PIN            5   // Digital 3  / Pin 5   / PE3  / SERVO2_PIN
+#define X_MS2_PIN            6   // Digital 6  / Pin 14  / PH3  / SERVO1_PIN
+#define Y_MS1_PIN           59   // Analog 5   / Pin 92  / PF5
+#define Y_MS2_PIN           58   // Analog 4   / Pin 93  / PF4
+#define Z_MS1_PIN           22   // Digital 22 / Pin 78  / PA0
+#define Z_MS2_PIN           39   // Digital 39 / Pin 70  / PG2
+#define E0_MS1_PIN          63   // Analog 9   / Pin 86  / PK1
+#define E0_MS2_PIN          64   // Analog 10  / Pin 87  / PK2
+#define E1_MS1_PIN          57   // Analog 3   / Pin 93  / PF3
+#define E1_MS2_PIN           4   // Digital 4  / Pin 1   / PG5  / SERVO3_PIN
diff --git a/Marlin/pins_PRINTRBOARD.h b/Marlin/pins_PRINTRBOARD.h
index 93f4b2b69..a8197af9a 100644
--- a/Marlin/pins_PRINTRBOARD.h
+++ b/Marlin/pins_PRINTRBOARD.h
@@ -148,8 +148,8 @@
 
     #define SDSS           43   // F5 TMS   JP2-8
 
-    #define STAT_LED_RED_PIN  12  // C2       JP11-14
-    #define STAT_LED_BLUE_PIN 10  // C0       JP11-12
+    #define STAT_LED_RED_PIN  12   // C2       JP11-14
+    #define STAT_LED_BLUE_PIN 10   // C0       JP11-12
 
   #elif ENABLED(LCD_I2C_PANELOLU2)
 
diff --git a/Marlin/pins_PRINTRBOARD_REVF.h b/Marlin/pins_PRINTRBOARD_REVF.h
index 48cf0fb2f..bf3a023c4 100644
--- a/Marlin/pins_PRINTRBOARD_REVF.h
+++ b/Marlin/pins_PRINTRBOARD_REVF.h
@@ -218,29 +218,29 @@
 
     #define SDSS            3   // F5 TMS   JP2-8
 
-    #define STAT_LED_RED_PIN  12  // C2       JP11-14
-    #define STAT_LED_BLUE_PIN 10  // C0       JP11-12
+    #define STAT_LED_RED_PIN  12   // C2       JP11-14
+    #define STAT_LED_BLUE_PIN 10   // C0       JP11-12
 
   #elif ENABLED(MINIPANEL)
 
     #if DISABLED(USE_INTERNAL_SD)
       //      PIN       FASTIO PIN#  ATUSB90 PIN# Teensy2.0++ PIN#  Printrboard RevF Conn.   MKSLCD12864 PIN#
-      #define SDSS               11  //        36               C1                EXP2-13             EXP2-07
-      #define SD_DETECT_PIN       9  //        34               E1                EXP2-11             EXP2-04
+      #define SDSS          11   //      36               C1                EXP2-13             EXP2-07
+      #define SD_DETECT_PIN  9   //      34               E1                EXP2-11             EXP2-04
     #endif
 
     //      PIN       FASTIO PIN#  ATUSB90 PIN# Teensy2.0++ PIN#  Printrboard RevF Conn.   MKSLCD12864 PIN#
-    #define DOGLCD_A0       4  //        29               D4                EXP2-05             EXP1-04
-    #define DOGLCD_CS       5  //        30               D5                EXP2-06             EXP1-05
-    #define BTN_ENC         6  //        31               D6                EXP2-07             EXP1-09
-    #define BEEPER_PIN      7  //        32               D7                EXP2-08             EXP1-10
-    #define KILL_PIN        8  //        33               E0                EXP2-10             EXP2-03
-    #define BTN_EN1        10  //        35               C0                EXP2-12             EXP2-06
-    #define BTN_EN2        12  //        37               C2                EXP2-14             EXP2-08
-    //#define LCD_BACKLIGHT_PIN 43  //        56               F5                EXP1-12     Not Implemented
-    //#define SCK          21  //        11               B1                ICSP-04             EXP2-09
-    //#define MOSI         22  //        12               B2                ICSP-03             EXP2-05
-    //#define MISO         23  //        13               B3                ICSP-06             EXP2-05
+    #define DOGLCD_A0       4   //       29               D4                EXP2-05             EXP1-04
+    #define DOGLCD_CS       5   //       30               D5                EXP2-06             EXP1-05
+    #define BTN_ENC         6   //       31               D6                EXP2-07             EXP1-09
+    #define BEEPER_PIN      7   //       32               D7                EXP2-08             EXP1-10
+    #define KILL_PIN        8   //       33               E0                EXP2-10             EXP2-03
+    #define BTN_EN1        10   //       35               C0                EXP2-12             EXP2-06
+    #define BTN_EN2        12   //       37               C2                EXP2-14             EXP2-08
+    //#define LCD_BACKLIGHT_PIN 43   //    56               F5                EXP1-12     Not Implemented
+    //#define SCK          21   //         11               B1                ICSP-04             EXP2-09
+    //#define MOSI         22   //         12               B2                ICSP-03             EXP2-05
+    //#define MISO         23   //         13               B3                ICSP-06             EXP2-05
 
     // increase delays
     #ifndef ST7920_DELAY_1
@@ -268,7 +268,7 @@
 //
 //      PIN       FASTIO PIN#  ATUSB90 PIN# Teensy2.0++ PIN#  Printrboard RevF Conn.
 #ifndef SDSS
-  #define SDSS             20  //        10               B0
+  #define SDSS             20   //       10               B0
 #endif
 
 /**
diff --git a/Marlin/pins_RAMBO.h b/Marlin/pins_RAMBO.h
index b294a169f..bcc1b4f62 100644
--- a/Marlin/pins_RAMBO.h
+++ b/Marlin/pins_RAMBO.h
@@ -49,10 +49,10 @@
 //
 // Servos
 //
-#define SERVO0_PIN         22 // Motor header MX1
-#define SERVO1_PIN         23 // Motor header MX2
-#define SERVO2_PIN         24 // Motor header MX3
-#define SERVO3_PIN          5 // PWM header pin 5
+#define SERVO0_PIN         22   // Motor header MX1
+#define SERVO1_PIN         23   // Motor header MX2
+#define SERVO2_PIN         24   // Motor header MX3
+#define SERVO3_PIN          5   // PWM header pin 5
 
 //
 // Limit Switches
@@ -107,7 +107,7 @@
 #define E1_MS2_PIN         64
 
 #define DIGIPOTSS_PIN      38
-#define DIGIPOT_CHANNELS {4,5,3,0,1} // X Y Z E0 E1 digipot channels to stepper driver mapping
+#define DIGIPOT_CHANNELS  { 4,5,3,0,1 }   // X Y Z E0 E1 digipot channels to stepper driver mapping
 #ifndef DIGIPOT_MOTOR_CURRENT
   #define DIGIPOT_MOTOR_CURRENT { 135,135,135,135,135 }   // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A)
 #endif
@@ -146,8 +146,8 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_PWM_PIN    45  // MUST BE HARDWARE PWM
-#define SPINDLE_LASER_ENABLE_PIN 31  // Pin should have a pullup!
+#define SPINDLE_LASER_PWM_PIN    45   // MUST BE HARDWARE PWM
+#define SPINDLE_LASER_ENABLE_PIN 31   // Pin should have a pullup!
 #define SPINDLE_DIR_PIN          32
 
 //
@@ -155,14 +155,14 @@
 //
 #define E_MUX0_PIN         17
 #define E_MUX1_PIN         16
-#define E_MUX2_PIN         84 // 84 in MK2 Firmware
+#define E_MUX2_PIN         84   // 84 in MK2 Firmware
 
 //
 // LCD / Controller
 //
 #if ENABLED(ULTRA_LCD)
 
-  #define KILL_PIN 80
+  #define KILL_PIN         80
 
   #if ENABLED(NEWPANEL)
 
@@ -174,32 +174,32 @@
     #define LCD_PINS_D7     75
 
     #if ENABLED(VIKI2) || ENABLED(miniVIKI)
-      #define BEEPER_PIN 44
+      #define BEEPER_PIN   44
       // NB: Panucatt's Viki 2.0 wiring diagram (v1.2) indicates that the
       //     beeper/buzzer is connected to pin 33; however, the pin used in the
       //     diagram is actually pin 44, so this is correct.
 
-      #define DOGLCD_A0  70
-      #define DOGLCD_CS  71
+      #define DOGLCD_A0    70
+      #define DOGLCD_CS    71
       #define LCD_SCREEN_ROT_180
 
-      #define BTN_EN1 85
-      #define BTN_EN2 84
-      #define BTN_ENC 83
+      #define BTN_EN1      85
+      #define BTN_EN2      84
+      #define BTN_ENC      83
 
-      #define SD_DETECT_PIN -1 // Pin 72 if using easy adapter board
+      #define SD_DETECT_PIN -1   // Pin 72 if using easy adapter board
 
       #define STAT_LED_RED_PIN 22
       #define STAT_LED_BLUE_PIN 32
 
     #else // !VIKI2 && !miniVIKI
 
-      #define BEEPER_PIN 79 // AUX-4
+      #define BEEPER_PIN   79   // AUX-4
 
       // AUX-2
-      #define BTN_EN1 76
-      #define BTN_EN2 77
-      #define BTN_ENC 78
+      #define BTN_EN1      76
+      #define BTN_EN2      77
+      #define BTN_ENC      78
 
       #define SD_DETECT_PIN 81
 
@@ -208,7 +208,7 @@
   #else // !NEWPANEL - old style panel with shift register
 
     // No Beeper added
-    #define BEEPER_PIN 33
+    #define BEEPER_PIN     33
 
     // buttons are attached to a shift register
     // Not wired yet
diff --git a/Marlin/pins_RAMPS.h b/Marlin/pins_RAMPS.h
index 22fddf8cf..6db6ffeb2 100644
--- a/Marlin/pins_RAMPS.h
+++ b/Marlin/pins_RAMPS.h
@@ -56,7 +56,7 @@
 // Servos
 //
 #ifdef IS_RAMPS_13
-  #define SERVO0_PIN        7 // RAMPS_13 // Will conflict with BTN_EN2 on LCD_I2C_VIKI
+  #define SERVO0_PIN        7   // RAMPS_13 // Will conflict with BTN_EN2 on LCD_I2C_VIKI
 #else
   #define SERVO0_PIN       11
 #endif
@@ -197,9 +197,9 @@
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS       66 // Do not use pin 53 if there is even the remote possibility of using Display/SD card
+  #define MAX6675_SS       66   // Do not use pin 53 if there is even the remote possibility of using Display/SD card
 #else
-  #define MAX6675_SS       66 // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
+  #define MAX6675_SS       66   // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
 #endif
 
 //
@@ -286,10 +286,10 @@
 
 #if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN) && !defined(SPINDLE_LASER_ENABLE_PIN)
   #if NUM_SERVOS <= 1 // try to use servo connector first
-    #define CASE_LIGHT_PIN   6      // MUST BE HARDWARE PWM
+    #define CASE_LIGHT_PIN    6   // MUST BE HARDWARE PWM
   #elif !(ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL) \
       && (ENABLED(PANEL_ONE) || ENABLED(VIKI2) || ENABLED(miniVIKI) || ENABLED(MINIPANEL) || ENABLED(REPRAPWORLD_KEYPAD)))  // try to use AUX 2
-    #define CASE_LIGHT_PIN   44     // MUST BE HARDWARE PWM
+    #define CASE_LIGHT_PIN   44   // MUST BE HARDWARE PWM
   #endif
 #endif
 
@@ -298,13 +298,13 @@
 //
 #if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENABLE)
   #if !defined(NUM_SERVOS) || NUM_SERVOS == 0 // try to use servo connector first
-    #define SPINDLE_LASER_ENABLE_PIN  4  // Pin should have a pullup/pulldown!
-    #define SPINDLE_LASER_PWM_PIN     6  // MUST BE HARDWARE PWM
+    #define SPINDLE_LASER_ENABLE_PIN  4   // Pin should have a pullup/pulldown!
+    #define SPINDLE_LASER_PWM_PIN     6   // MUST BE HARDWARE PWM
     #define SPINDLE_DIR_PIN           5
   #elif !(ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL) \
       && (ENABLED(PANEL_ONE) || ENABLED(VIKI2) || ENABLED(miniVIKI) || ENABLED(MINIPANEL) || ENABLED(REPRAPWORLD_KEYPAD)))  // try to use AUX 2
-    #define SPINDLE_LASER_ENABLE_PIN 40  // Pin should have a pullup/pulldown!
-    #define SPINDLE_LASER_PWM_PIN    44  // MUST BE HARDWARE PWM
+    #define SPINDLE_LASER_ENABLE_PIN 40   // Pin should have a pullup/pulldown!
+    #define SPINDLE_LASER_PWM_PIN    44   // MUST BE HARDWARE PWM
     #define SPINDLE_DIR_PIN          65
   #endif
 #endif
@@ -333,9 +333,9 @@
   //
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
-    #define LCD_PINS_RS         49 // CS chip select /SS chip slave select
-    #define LCD_PINS_ENABLE     51 // SID (MOSI)
-    #define LCD_PINS_D4         52 // SCK (CLK) clock
+    #define LCD_PINS_RS         49   // CS chip select /SS chip slave select
+    #define LCD_PINS_ENABLE     51   // SID (MOSI)
+    #define LCD_PINS_D4         52   // SCK (CLK) clock
 
   #elif ENABLED(NEWPANEL) && ENABLED(PANEL_ONE)
 
@@ -370,8 +370,8 @@
     #else
 
       #if ENABLED(MKS_12864OLED) || ENABLED(MKS_12864OLED_SSD1306)
-        #define LCD_PINS_DC     25 // Set as output on init
-        #define LCD_PINS_RS     27 // Pull low for 1s to init
+        #define LCD_PINS_DC     25   // Set as output on init
+        #define LCD_PINS_RS     27   // Pull low for 1s to init
         // DOGM SPI LCD Support
         #define DOGLCD_CS       16
         #define DOGLCD_MOSI     17
@@ -446,8 +446,8 @@
 
     #elif ENABLED(LCD_I2C_VIKI)
 
-      #define BTN_EN1           22 // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
-      #define BTN_EN2            7 // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
+      #define BTN_EN1           22   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+      #define BTN_EN2            7   // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
       #define BTN_ENC           -1
 
       #define LCD_SDSS          53
@@ -468,7 +468,7 @@
       #define BTN_ENC           39
 
       #define SDSS              53
-      #define SD_DETECT_PIN     -1 // Pin 49 for display sd interface, 72 for easy adapter board
+      #define SD_DETECT_PIN     -1   // Pin 49 for display sd interface, 72 for easy adapter board
       #define KILL_PIN          31
 
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
@@ -487,7 +487,7 @@
       #define SD_DETECT_PIN     49
       #define KILL_PIN          41
 
-    #elif ENABLED(MKS_MINI_12864)  // Added in Marlin 1.1.6
+    #elif ENABLED(MKS_MINI_12864)   // Added in Marlin 1.1.6
 
       #define DOGLCD_A0         27
       #define DOGLCD_CS         25
@@ -501,7 +501,7 @@
 
       #define BEEPER_PIN        37
       // not connected to a pin
-      #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
+      #define LCD_BACKLIGHT_PIN 65   // backlight LED on A11/D65
 
       #define BTN_EN1           31
       #define BTN_EN2           33
@@ -515,7 +515,7 @@
 
       #define BEEPER_PIN        42
       // not connected to a pin
-      #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
+      #define LCD_BACKLIGHT_PIN 65   // backlight LED on A11/D65
 
       #define DOGLCD_A0         44
       #define DOGLCD_CS         66
@@ -553,9 +553,9 @@
         #define BTN_EN2         59
         #define BTN_ENC         63
       #elif ENABLED(PANEL_ONE)
-        #define BTN_EN1         59 // AUX2 PIN 3
-        #define BTN_EN2         63 // AUX2 PIN 4
-        #define BTN_ENC         49 // AUX3 PIN 7
+        #define BTN_EN1         59   // AUX2 PIN 3
+        #define BTN_EN2         63   // AUX2 PIN 4
+        #define BTN_ENC         49   // AUX3 PIN 7
       #else
         #define BTN_EN1         37
         #define BTN_EN2         35
diff --git a/Marlin/pins_RAMPS_OLD.h b/Marlin/pins_RAMPS_OLD.h
index 870f2fbd1..951e3b000 100644
--- a/Marlin/pins_RAMPS_OLD.h
+++ b/Marlin/pins_RAMPS_OLD.h
@@ -77,9 +77,9 @@
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS       66 // Do not use pin 53 if there is even the remote possibility of using Display/SD card
+  #define MAX6675_SS       66   // Do not use pin 53 if there is even the remote possibility of using Display/SD card
 #else
-  #define MAX6675_SS       66 // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
+  #define MAX6675_SS       66   // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
 #endif
 
 //
@@ -101,11 +101,11 @@
 #define SDPOWER            48
 #define SDSS               53
 #define LED_PIN            13
-#define CASE_LIGHT_PIN     45     // MUST BE HARDWARE PWM
+#define CASE_LIGHT_PIN     45   // MUST BE HARDWARE PWM
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_ENABLE_PIN 41  // Pin should have a pullup/pulldown!
-#define SPINDLE_LASER_PWM_PIN    45  // MUST BE HARDWARE PWM
+#define SPINDLE_LASER_ENABLE_PIN 41   // Pin should have a pullup/pulldown!
+#define SPINDLE_LASER_PWM_PIN    45   // MUST BE HARDWARE PWM
 #define SPINDLE_DIR_PIN          43
diff --git a/Marlin/pins_RUMBA.h b/Marlin/pins_RUMBA.h
index 56caf8864..970ca5b1d 100644
--- a/Marlin/pins_RUMBA.h
+++ b/Marlin/pins_RUMBA.h
@@ -154,10 +154,10 @@
 // M3/M4/M5 - Spindle/Laser Control
 //
 #ifndef SPINDLE_LASER_PWM_PIN
-  #define SPINDLE_LASER_PWM_PIN     4  // MUST BE HARDWARE PWM. Pin 4 interrupts OC0* and OC1* always in use?
+  #define SPINDLE_LASER_PWM_PIN     4   // MUST BE HARDWARE PWM. Pin 4 interrupts OC0* and OC1* always in use?
 #endif
 #ifndef SPINDLE_LASER_ENABLE_PIN
-  #define SPINDLE_LASER_ENABLE_PIN 14  // Pin should have a pullup!
+  #define SPINDLE_LASER_ENABLE_PIN 14   // Pin should have a pullup!
 #endif
 #ifndef SPINDLE_DIR_PIN
   #define SPINDLE_DIR_PIN          15
diff --git a/Marlin/pins_SAINSMART_2IN1.h b/Marlin/pins_SAINSMART_2IN1.h
index bf01a9e05..53d1a3e95 100644
--- a/Marlin/pins_SAINSMART_2IN1.h
+++ b/Marlin/pins_SAINSMART_2IN1.h
@@ -21,7 +21,7 @@
  */
 
 /**
- *  Sainsmart 2-in-1 pin assignments
+ * Sainsmart 2-in-1 pin assignments
  */
 
 #if HOTENDS > 2 || E_STEPPERS > 2
@@ -33,9 +33,9 @@
 //
 // Heaters / Fans
 //
-#define RAMPS_D10_PIN 9 // E
-#define RAMPS_D9_PIN  7 // F PART FAN in front of board next to Extruder heat
-     // RAMPS_D8_PIN  8 // B
-#define MOSFET_D_PIN 10 // F / E
+#define RAMPS_D10_PIN 9   // E
+#define RAMPS_D9_PIN  7   // F PART FAN in front of board next to Extruder heat
+     // RAMPS_D8_PIN  8   // B
+#define MOSFET_D_PIN 10   // F / E
 
 #include "pins_RAMPS.h"
diff --git a/Marlin/pins_SANGUINOLOLU_11.h b/Marlin/pins_SANGUINOLOLU_11.h
index e37af51bc..b7f3e0d13 100644
--- a/Marlin/pins_SANGUINOLOLU_11.h
+++ b/Marlin/pins_SANGUINOLOLU_11.h
@@ -90,23 +90,23 @@
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       13 // (extruder)
+#define HEATER_0_PIN       13   // (extruder)
 
 #if ENABLED(SANGUINOLOLU_V_1_2)
 
-  #define HEATER_BED_PIN   12 // (bed)
+  #define HEATER_BED_PIN   12   // (bed)
   #define X_ENABLE_PIN     14
   #define Y_ENABLE_PIN     14
   #define Z_ENABLE_PIN     26
   #define E0_ENABLE_PIN    14
 
   #if ENABLED(LCD_I2C_PANELOLU2)
-    #define FAN_PIN         4 // Uses Transistor1 (PWM) on Panelolu2's Sanguino Adapter Board to drive the fan
+    #define FAN_PIN         4   // Uses Transistor1 (PWM) on Panelolu2's Sanguino Adapter Board to drive the fan
   #endif
 
 #else
 
-  #define HEATER_BED_PIN   14 // (bed)
+  #define HEATER_BED_PIN   14   // (bed)
   #define X_ENABLE_PIN     -1
   #define Y_ENABLE_PIN     -1
   #define Z_ENABLE_PIN     -1
@@ -134,11 +134,11 @@
 #if ENABLED(IS_MELZI)
   #define LED_PIN          27
 #elif MB(STB_11)
-  #define LCD_BACKLIGHT_PIN 17 // LCD backlight LED
+  #define LCD_BACKLIGHT_PIN 17   // LCD backlight LED
 #endif
 
 #if DISABLED(SPINDLE_LASER_ENABLE) && ENABLED(SANGUINOLOLU_V_1_2) && !(ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL))  // try to use IO Header
-  #define CASE_LIGHT_PIN     4 // MUST BE HARDWARE PWM  - see if IO Header is available
+  #define CASE_LIGHT_PIN     4   // MUST BE HARDWARE PWM  - see if IO Header is available
 #endif
 
 /**
@@ -160,9 +160,9 @@
     #if ENABLED(U8GLIB_ST7920) // SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
 
       #if ENABLED(IS_MELZI)
-        #define LCD_PINS_RS     30 // CS chip select /SS chip slave select
-        #define LCD_PINS_ENABLE 29 // SID (MOSI)
-        #define LCD_PINS_D4     17 // SCK (CLK) clock
+        #define LCD_PINS_RS     30   // CS chip select /SS chip slave select
+        #define LCD_PINS_ENABLE 29   // SID (MOSI)
+        #define LCD_PINS_D4     17   // SCK (CLK) clock
         // Pin 27 is taken by LED_PIN, but Melzi LED does nothing with
         // Marlin so this can be used for BEEPER_PIN. You can use this pin
         // with M42 instead of BEEPER_PIN.
@@ -185,7 +185,7 @@
 
         #define BEEPER_PIN      29
         #define DOGLCD_CS       17
-        #define LCD_BACKLIGHT_PIN 28 // PA3
+        #define LCD_BACKLIGHT_PIN 28   // PA3
 
       #elif MB(CREALITY_ENDER)
 
@@ -224,7 +224,7 @@
 
     #if ENABLED(IS_MELZI)
       #define BTN_ENC           29
-      #define LCD_SDSS          30 // Panelolu2 SD card reader rather than the Melzi
+      #define LCD_SDSS          30   // Panelolu2 SD card reader rather than the Melzi
     #else
       #define BTN_ENC           30
     #endif
@@ -265,7 +265,7 @@
   #else  // !LCD_I2C_PANELOLU2 && !LCD_FOR_MELZI && !ZONESTAR_LCD
 
     #define BTN_ENC             16
-    #define LCD_SDSS            28 // Smart Controller SD card reader rather than the Melzi
+    #define LCD_SDSS            28   // Smart Controller SD card reader rather than the Melzi
 
   #endif
 
@@ -279,8 +279,8 @@
 #if ENABLED(SPINDLE_LASER_ENABLE)
   #if !MB(AZTEEG_X1) && ENABLED(SANGUINOLOLU_V_1_2) && !(ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL))  // try to use IO Header
 
-    #define SPINDLE_LASER_ENABLE_PIN 10  // Pin should have a pullup/pulldown!
-    #define SPINDLE_LASER_PWM_PIN     4  // MUST BE HARDWARE PWM
+    #define SPINDLE_LASER_ENABLE_PIN 10   // Pin should have a pullup/pulldown!
+    #define SPINDLE_LASER_PWM_PIN     4   // MUST BE HARDWARE PWM
     #define SPINDLE_DIR_PIN          11
 
   #elif !MB(MELZI)  // use X stepper motor socket
@@ -318,8 +318,8 @@
     #define X_DIR_PIN                 0
     #define X_ENABLE_PIN             14
     #define X_STEP_PIN                1
-    #define SPINDLE_LASER_PWM_PIN    15  // MUST BE HARDWARE PWM
-    #define SPINDLE_LASER_ENABLE_PIN 21  // Pin should have a pullup!
-    #define SPINDLE_DIR_PIN          -1  // No pin available on the socket for the direction pin
+    #define SPINDLE_LASER_PWM_PIN    15   // MUST BE HARDWARE PWM
+    #define SPINDLE_LASER_ENABLE_PIN 21   // Pin should have a pullup!
+    #define SPINDLE_DIR_PIN          -1   // No pin available on the socket for the direction pin
   #endif
 #endif // SPINDLE_LASER_ENABLE
diff --git a/Marlin/pins_SAV_MKI.h b/Marlin/pins_SAV_MKI.h
index 99dd228cd..1241ee083 100644
--- a/Marlin/pins_SAV_MKI.h
+++ b/Marlin/pins_SAV_MKI.h
@@ -173,10 +173,10 @@
   //
   // M3/M4/M5 - Spindle/Laser Control
   //
-  #define SPINDLE_LASER_PWM_PIN    24  // B4  PWM2A
-  #define SPINDLE_LASER_ENABLE_PIN 39  // F1  Pin should have a pullup!
-  #define SPINDLE_DIR_PIN          40  // F2
+  #define SPINDLE_LASER_PWM_PIN    24   // B4  PWM2A
+  #define SPINDLE_LASER_ENABLE_PIN 39   // F1  Pin should have a pullup!
+  #define SPINDLE_DIR_PIN          40   // F2
 
-  #define CASE_LIGHT_PIN            0  // D0  PWM0B
+  #define CASE_LIGHT_PIN            0   // D0  PWM0B
 
 #endif
diff --git a/Marlin/pins_SCOOVO_X9H.h b/Marlin/pins_SCOOVO_X9H.h
index 52b8d1400..c0852bf31 100644
--- a/Marlin/pins_SCOOVO_X9H.h
+++ b/Marlin/pins_SCOOVO_X9H.h
@@ -33,10 +33,10 @@
 //
 // Servos
 //
-#define SERVO0_PIN 22 // Motor header MX1
-#define SERVO1_PIN 23 // Motor header MX2
-#define SERVO2_PIN 24 // Motor header MX3
-#define SERVO3_PIN  5 // PWM header pin 5
+#define SERVO0_PIN 22   // Motor header MX1
+#define SERVO1_PIN 23   // Motor header MX2
+#define SERVO2_PIN 24   // Motor header MX3
+#define SERVO3_PIN  5   // PWM header pin 5
 
 //
 // Limit Switches
diff --git a/Marlin/pins_SETHI.h b/Marlin/pins_SETHI.h
index ac570fd27..293373a6d 100644
--- a/Marlin/pins_SETHI.h
+++ b/Marlin/pins_SETHI.h
@@ -56,7 +56,7 @@
 #define BOARD_NAME "Sethi 3D_1"
 
 #ifndef GEN7_VERSION
-  #define GEN7_VERSION 12 // v1.x
+  #define GEN7_VERSION 12   // v1.x
 #endif
 
 //
diff --git a/Marlin/pins_SILVER_GATE.h b/Marlin/pins_SILVER_GATE.h
index e66615e4e..ca96a427c 100644
--- a/Marlin/pins_SILVER_GATE.h
+++ b/Marlin/pins_SILVER_GATE.h
@@ -60,7 +60,7 @@
 
 #define HEATER_0_PIN        7
 
-#define ORIG_E0_AUTO_FAN_PIN 3  // Use this by NOT overriding E0_AUTO_FAN_PIN
+#define ORIG_E0_AUTO_FAN_PIN 3   // Use this by NOT overriding E0_AUTO_FAN_PIN
 #define CONTROLLER_FAN_PIN  2
 
 #define TEMP_0_PIN          7   // Analog Input
diff --git a/Marlin/pins_TEENSY2.h b/Marlin/pins_TEENSY2.h
index 9800eb027..16fcd46f1 100644
--- a/Marlin/pins_TEENSY2.h
+++ b/Marlin/pins_TEENSY2.h
@@ -177,6 +177,6 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_ENABLE_PIN  5  // D5  Pin should have a pullup!
-#define SPINDLE_LASER_PWM_PIN     0  // D0 PWM0B   MUST BE HARDWARE PWM
-#define SPINDLE_DIR_PIN           7  // D7
+#define SPINDLE_LASER_ENABLE_PIN  5   // D5  Pin should have a pullup!
+#define SPINDLE_LASER_PWM_PIN     0   // D0 PWM0B   MUST BE HARDWARE PWM
+#define SPINDLE_DIR_PIN           7   // D7
diff --git a/Marlin/pins_ULTIMAIN_2.h b/Marlin/pins_ULTIMAIN_2.h
index 4ac26c6af..c52b20c3e 100644
--- a/Marlin/pins_ULTIMAIN_2.h
+++ b/Marlin/pins_ULTIMAIN_2.h
@@ -101,8 +101,8 @@
 #define SDSS               53
 #define SD_DETECT_PIN      39
 #define LED_PIN             8
-#define SAFETY_TRIGGERED_PIN     28 // PIN to detect the safety circuit has triggered
-#define MAIN_VOLTAGE_MEASURE_PIN 14 // ANALOG PIN to measure the main voltage, with a 100k - 4k7 resitor divider.
+#define SAFETY_TRIGGERED_PIN     28   // PIN to detect the safety circuit has triggered
+#define MAIN_VOLTAGE_MEASURE_PIN 14   // ANALOG PIN to measure the main voltage, with a 100k - 4k7 resitor divider.
 
 //
 // LCD / Controller
@@ -127,8 +127,8 @@
 #if ENABLED(SPINDLE_LASER_ENABLE)   // use the LED_PIN for spindle speed control or case light
   #undef LED_PIN
   #define SPINDLE_DIR_PIN          16
-  #define SPINDLE_LASER_ENABLE_PIN 17  // Pin should have a pullup!
-  #define SPINDLE_LASER_PWM_PIN     8  // MUST BE HARDWARE PWM
+  #define SPINDLE_LASER_ENABLE_PIN 17   // Pin should have a pullup!
+  #define SPINDLE_LASER_PWM_PIN     8   // MUST BE HARDWARE PWM
 #else
   #undef LED_PIN
   #define CASE_LIGHT_PIN            8
diff --git a/Marlin/pins_ULTIMAKER.h b/Marlin/pins_ULTIMAKER.h
index 4549bf7fc..0d1a65431 100644
--- a/Marlin/pins_ULTIMAKER.h
+++ b/Marlin/pins_ULTIMAKER.h
@@ -43,7 +43,7 @@
 //
 // Servos
 //
-#define SERVO0_PIN         13 // untested
+#define SERVO0_PIN         13   // UNTESTED
 
 //
 // Limit Switches
@@ -157,6 +157,6 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_PWM_PIN     9  // MUST BE HARDWARE PWM
-#define SPINDLE_LASER_ENABLE_PIN 10  // Pin should have a pullup!
-#define SPINDLE_DIR_PIN          11  // use the EXP3 PWM header
+#define SPINDLE_LASER_PWM_PIN     9   // MUST BE HARDWARE PWM
+#define SPINDLE_LASER_ENABLE_PIN 10   // Pin should have a pullup!
+#define SPINDLE_DIR_PIN          11   // use the EXP3 PWM header
diff --git a/Marlin/pins_ULTIMAKER_OLD.h b/Marlin/pins_ULTIMAKER_OLD.h
index e04907d98..c07f2d0e7 100644
--- a/Marlin/pins_ULTIMAKER_OLD.h
+++ b/Marlin/pins_ULTIMAKER_OLD.h
@@ -72,21 +72,21 @@
 // Limit Switches
 //
 #if ENABLED(board_rev_1_1_TO_1_3)
-  #define X_MIN_PIN          15  // SW1
-  #define X_MAX_PIN          14  // SW2
-  #define Y_MIN_PIN          17  // SW3
-  #define Y_MAX_PIN          16  // SW4
-  #define Z_MIN_PIN          19  // SW5
-  #define Z_MAX_PIN          18  // SW6
+  #define X_MIN_PIN          15   // SW1
+  #define X_MAX_PIN          14   // SW2
+  #define Y_MIN_PIN          17   // SW3
+  #define Y_MAX_PIN          16   // SW4
+  #define Z_MIN_PIN          19   // SW5
+  #define Z_MAX_PIN          18   // SW6
 #endif
 
 #if ENABLED(board_rev_1_0)
-  #define X_MIN_PIN          13  // SW1
-  #define X_MAX_PIN          12  // SW2
-  #define Y_MIN_PIN          11  // SW3
-  #define Y_MAX_PIN          10  // SW4
-  #define Z_MIN_PIN           9  // SW5
-  #define Z_MAX_PIN           8  // SW6
+  #define X_MIN_PIN          13   // SW1
+  #define X_MAX_PIN          12   // SW2
+  #define Y_MIN_PIN          11   // SW3
+  #define Y_MAX_PIN          10   // SW4
+  #define Z_MIN_PIN           9   // SW5
+  #define Z_MAX_PIN           8   // SW6
 #endif
 
 #if ENABLED(board_rev_1_5)
@@ -124,9 +124,9 @@
 #define E0_DIR_PIN         45
 #define E0_ENABLE_PIN      41
 
-#define E1_STEP_PIN        -1  // 49
-#define E1_DIR_PIN         -1  // 47
-#define E1_ENABLE_PIN      -1  // 48
+#define E1_STEP_PIN        -1   // 49
+#define E1_DIR_PIN         -1   // 47
+#define E1_ENABLE_PIN      -1   // 48
 
 //
 // Temperature Sensors
@@ -138,7 +138,7 @@
 // Heaters / Fans
 //
 #define HEATER_0_PIN        2
-//#define HEATER_1_PIN        3 // used for case light   Rev A said "1"
+//#define HEATER_1_PIN        3   // used for case light   Rev A said "1"
 #define HEATER_BED_PIN      4
 
 //
@@ -196,7 +196,7 @@
 // case light  - see spindle section for more info on available hardware PWMs
 //
 #if !PIN_EXISTS(CASE_LIGHT) && ENABLED(board_rev_1_5)
-  #define CASE_LIGHT_PIN        7  // use PWM -  MUST BE HARDWARE PWM
+  #define CASE_LIGHT_PIN        7   // use PWM -  MUST BE HARDWARE PWM
 #endif
 
 //
@@ -214,19 +214,19 @@
     #undef Z_MIN_PIN              // SW5
     #undef Z_MAX_PIN              // SW6
 
-    #define X_STOP_PIN         13  // SW1  (didn't change) - also has a useable hardware PWM
-    #define Y_STOP_PIN         12  // SW2
-    #define Z_STOP_PIN         11  // SW3
+    #define X_STOP_PIN         13   // SW1  (didn't change) - also has a useable hardware PWM
+    #define Y_STOP_PIN         12   // SW2
+    #define Z_STOP_PIN         11   // SW3
 
-    #define SPINDLE_DIR_PIN          10  // SW4
-    #define SPINDLE_LASER_PWM_PIN     9  // SW5  MUST BE HARDWARE PWM
-    #define SPINDLE_LASER_ENABLE_PIN  8  // SW6  Pin should have a pullup!
+    #define SPINDLE_DIR_PIN          10   // SW4
+    #define SPINDLE_LASER_PWM_PIN     9   // SW5  MUST BE HARDWARE PWM
+    #define SPINDLE_LASER_ENABLE_PIN  8   // SW6  Pin should have a pullup!
 
   #elif ENABLED(board_rev_1_5)      // use the same pins - but now they are on a different connector
 
-    #define SPINDLE_DIR_PIN          10  // EXP3-6 (silkscreen says 10)
-    #define SPINDLE_LASER_PWM_PIN     9  // EXP3-7 (silkscreen says 9) MUST BE HARDWARE PWM
-    #define SPINDLE_LASER_ENABLE_PIN  8  // EXP3-8 (silkscreen says 8) Pin should have a pullup!
+    #define SPINDLE_DIR_PIN          10   // EXP3-6 (silkscreen says 10)
+    #define SPINDLE_LASER_PWM_PIN     9   // EXP3-7 (silkscreen says 9) MUST BE HARDWARE PWM
+    #define SPINDLE_LASER_ENABLE_PIN  8   // EXP3-8 (silkscreen says 8) Pin should have a pullup!
 
   #elif ENABLED(board_rev_1_1_TO_1_3)
 
@@ -249,14 +249,14 @@
       #define E0_DIR_PIN               47
       #define E0_ENABLE_PIN            48
       #define SPINDLE_DIR_PIN          43
-      #define SPINDLE_LASER_PWM_PIN    45  // MUST BE HARDWARE PWM
-      #define SPINDLE_LASER_ENABLE_PIN 41  // Pin should have a pullup!
+      #define SPINDLE_LASER_PWM_PIN    45   // MUST BE HARDWARE PWM
+      #define SPINDLE_LASER_ENABLE_PIN 41   // Pin should have a pullup!
     #elif TEMP_SENSOR_BED == 0  // Can't use E0 so see if HEATER_BED_PIN is available
       #undef HEATER_BED_PIN
-      #define SPINDLE_DIR_PIN          38  // Probably pin 4 on 10 pin connector closest to the E0 socket
-      #define SPINDLE_LASER_PWM_PIN     4  // MUST BE HARDWARE PWM - Special precautions usually needed.
-      #define SPINDLE_LASER_ENABLE_PIN 40  // Pin should have a pullup! (Probably pin 6 on the 10-pin
-                                           // connector closest to the E0 socket)
+      #define SPINDLE_DIR_PIN          38   // Probably pin 4 on 10 pin connector closest to the E0 socket
+      #define SPINDLE_LASER_PWM_PIN     4   // MUST BE HARDWARE PWM - Special precautions usually needed.
+      #define SPINDLE_LASER_ENABLE_PIN 40   // Pin should have a pullup! (Probably pin 6 on the 10-pin
+                                            // connector closest to the E0 socket)
     #endif
   #endif
 #endif