diff --git a/quantum/debounce/eager_pk.c b/quantum/debounce/eager_pk.c
index 46768922432d..6fa956bf3b45 100644
--- a/quantum/debounce/eager_pk.c
+++ b/quantum/debounce/eager_pk.c
@@ -45,12 +45,12 @@ static bool                matrix_need_update;
 #define MAX_DEBOUNCE (DEBOUNCE_ELAPSED - 1)
 
 static uint8_t wrapping_timer_read(void) {
-    static uint16_t time = 0;
+    static uint16_t time        = 0;
     static uint8_t  last_result = 0;
-    uint16_t new_time = timer_read();
-    uint16_t diff = new_time - time;
-    time = new_time;
-    last_result = (last_result + diff) % (MAX_DEBOUNCE + 1);
+    uint16_t        new_time    = timer_read();
+    uint16_t        diff        = new_time - time;
+    time                        = new_time;
+    last_result                 = (last_result + diff) % (MAX_DEBOUNCE + 1);
     return last_result;
 }
 
diff --git a/quantum/debounce/eager_pr.c b/quantum/debounce/eager_pr.c
index 41843aedbc6c..d12931fddbfd 100644
--- a/quantum/debounce/eager_pr.c
+++ b/quantum/debounce/eager_pr.c
@@ -37,12 +37,12 @@ static bool                counters_need_update;
 #define MAX_DEBOUNCE (DEBOUNCE_ELAPSED - 1)
 
 static uint8_t wrapping_timer_read(void) {
-    static uint16_t time = 0;
+    static uint16_t time        = 0;
     static uint8_t  last_result = 0;
-    uint16_t new_time = timer_read();
-    uint16_t diff = new_time - time;
-    time = new_time;
-    last_result = (last_result + diff) % (MAX_DEBOUNCE + 1);
+    uint16_t        new_time    = timer_read();
+    uint16_t        diff        = new_time - time;
+    time                        = new_time;
+    last_result                 = (last_result + diff) % (MAX_DEBOUNCE + 1);
     return last_result;
 }
 
diff --git a/tmk_core/common/timer.h b/tmk_core/common/timer.h
index 117b41d1be07..52bc1cc671c2 100644
--- a/tmk_core/common/timer.h
+++ b/tmk_core/common/timer.h
@@ -25,10 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    include "avr/timer_avr.h"
 #endif
 
-#define TIMER_DIFF(a, b, max) ((max == UINT8_MAX) ? ((uint8_t)((a)-(b))) : ( \
-                               (max == UINT16_MAX) ? ((uint16_t)((a)-(b))) : ( \
-                               (max == UINT32_MAX) ? ((uint32_t)((a)-(b))) : ( \
-                               (a) >= (b) ? (a) - (b) : (max) + 1 - (b) + (a) ))))
+#define TIMER_DIFF(a, b, max) ((max == UINT8_MAX) ? ((uint8_t)((a) - (b))) : ((max == UINT16_MAX) ? ((uint16_t)((a) - (b))) : ((max == UINT32_MAX) ? ((uint32_t)((a) - (b))) : ((a) >= (b) ? (a) - (b) : (max) + 1 - (b) + (a)))))
 #define TIMER_DIFF_8(a, b) TIMER_DIFF(a, b, UINT8_MAX)
 #define TIMER_DIFF_16(a, b) TIMER_DIFF(a, b, UINT16_MAX)
 #define TIMER_DIFF_32(a, b) TIMER_DIFF(a, b, UINT32_MAX)