diff --git a/Marlin/pinsDebug.h b/Marlin/pinsDebug.h
index a14f2b519..18062b79e 100644
--- a/Marlin/pinsDebug.h
+++ b/Marlin/pinsDebug.h
@@ -357,7 +357,7 @@ static void pwm_details(uint8_t pin) {
   // on pins that have two PWMs, print info on second PWM
   #if AVR_ATmega2560_FAMILY || AVR_AT90USB1286_FAMILY
     // looking for port B7 - PWMs 0A and 1C
-    if ( ('B' == digitalPinToPort(pin) + 64) && (0x80 == digitalPinToBitMask(pin))) {
+    if (digitalPinToPort(pin) == 2 && digitalPinToBitMask(pin) == 0x80) {
       #ifndef TEENSYDUINO_IDE
         SERIAL_PROTOCOLPGM("\n .");
         SERIAL_PROTOCOL_SP(18);
diff --git a/Marlin/pins_BRAINWAVE.h b/Marlin/pins_BRAINWAVE.h
index 0d17cac10..83e7a35a9 100644
--- a/Marlin/pins_BRAINWAVE.h
+++ b/Marlin/pins_BRAINWAVE.h
@@ -41,7 +41,7 @@
  *
  *    "Marlin_AT90USB" makes PWM0A available rather than the usual PWM1C. These PWMs share
  *    the same physical pin. Marlin uses TIMER1 to generate interrupts and sets it up such
- *    that PWM1A, PWM1B & PWM1C can not be used.
+ *    that PWM1A, PWM1B & PWM1C can't be used.
  *
  *  Installation:
  *
diff --git a/Marlin/pins_BRAINWAVE_PRO.h b/Marlin/pins_BRAINWAVE_PRO.h
index 1884d3cb1..02835ca27 100644
--- a/Marlin/pins_BRAINWAVE_PRO.h
+++ b/Marlin/pins_BRAINWAVE_PRO.h
@@ -63,7 +63,7 @@
  *
  *    "Marlin_AT90USB" makes PWM0A available rather than the usual PWM1C. These PWMs share
  *    the same physical pin. Marlin uses TIMER1 to generate interrupts and sets it up such
- *    that PWM1A, PWM1B & PWM1C can not be used.
+ *    that PWM1A, PWM1B & PWM1C can't be used.
  *
  *    Installation:
  *
diff --git a/Marlin/pins_RUMBA.h b/Marlin/pins_RUMBA.h
index 23a9c3ad1..5f567783a 100644
--- a/Marlin/pins_RUMBA.h
+++ b/Marlin/pins_RUMBA.h
@@ -100,7 +100,7 @@
 #endif
 
 #if TEMP_SENSOR_2 == -1
-  #define TEMP_2_PIN        7   // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can not be used when TEMP_SENSOR_BED is defined as thermocouple)
+  #define TEMP_2_PIN        7   // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can't be used when TEMP_SENSOR_BED is defined as thermocouple)
 #else
   #define TEMP_2_PIN       13   // Analog Input (default connector for thermistor *T2* on rumba board is used)
 #endif
@@ -109,7 +109,7 @@
 //#define TEMP_X_PIN         12   // Analog Input (default connector for thermistor *T3* on rumba board is used)
 
 #if TEMP_SENSOR_BED == -1
-  #define TEMP_BED_PIN      7   // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can not be used when TEMP_SENSOR_2 is defined as thermocouple)
+  #define TEMP_BED_PIN      7   // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can't be used when TEMP_SENSOR_2 is defined as thermocouple)
 #else
   #define TEMP_BED_PIN     11   // Analog Input (default connector for thermistor *THB* on rumba board is used)
 #endif
diff --git a/Marlin/pins_TEENSYLU.h b/Marlin/pins_TEENSYLU.h
index d845e312e..5f12e710c 100644
--- a/Marlin/pins_TEENSYLU.h
+++ b/Marlin/pins_TEENSYLU.h
@@ -68,7 +68,7 @@
  *
  *  NOTE - the "Marlin_AT90USB" pin maps make PWM0A available rather than the usual PWM1C.
  *         These PWMs share the same physical pin. Marlin uses TIMER1 to generate
- *         interrupts and sets it up such that PWM1A, PWM1B & PWM1C can not be used.
+ *         interrupts and sets it up such that PWM1A, PWM1B & PWM1C can't be used.
  */
 
  /**
diff --git a/buildroot/share/pin_interrupt_test/pin_interrupt_test.ino b/buildroot/share/pin_interrupt_test/pin_interrupt_test.ino
index 8650a3d13..9702d9d91 100644
--- a/buildroot/share/pin_interrupt_test/pin_interrupt_test.ino
+++ b/buildroot/share/pin_interrupt_test/pin_interrupt_test.ino
@@ -1,26 +1,26 @@
-// Search pins uasable for endstop-interupts
-// Compile with the same settings you'd use with Marlin.
+// Search pins usable for endstop-interrupts
+// Compile with the same build settings you'd use for Marlin.
 
 #if defined(ARDUINO_AVR_MEGA2560) || defined(ARDUINO_AVR_MEGA)
     #undef  digitalPinToPCICR
-    #define digitalPinToPCICR(p)    ( (((p) >= 10) && ((p) <= 15)) || \
-                                    (((p) >= 50) && ((p) <= 53)) || \
-                                    (((p) >= 62) && ((p) <= 69)) ? (&PCICR) : ((uint8_t *)0) )
+    #define digitalPinToPCICR(p)    ( ((p) >= 10 && (p) <= 15) || \
+                                      ((p) >= 50 && (p) <= 53) || \
+                                      ((p) >= 62 && (p) <= 69) ? &PCICR : (uint8_t *)0)
 #endif
 
 void setup() {
   Serial.begin(9600);
   Serial.println("PINs causing interrups are:");
-  for(int i=2; i<NUM_DIGITAL_PINS; i++){
-    if( digitalPinToPCICR(i) != NULL || (int)digitalPinToInterrupt(i) != -1 ) {
-      for (int j= 0; j<NUM_ANALOG_INPUTS; j++){
-        if(analogInputToDigitalPin(j) == i) {
-          Serial.print("A");
+  for (int i = 2; i < NUM_DIGITAL_PINS; i++) {
+    if (digitalPinToPCICR(i) || (int)digitalPinToInterrupt(i) != -1) {
+      for (int j = 0; j < NUM_ANALOG_INPUTS; j++) {
+        if (analogInputToDigitalPin(j) == i) {
+          Serial.print('A');
           Serial.print(j);
           Serial.print(" = ");
         }
       }
-      Serial.print("D");
+      Serial.print('D');
       Serial.println(i);
     }
   }