diff --git a/quantum/matrix.c b/quantum/matrix.c
index 9e998508a7..c68c56cac2 100644
--- a/quantum/matrix.c
+++ b/quantum/matrix.c
@@ -89,7 +89,7 @@ static void init_pins(void) {
     }
 }
 
-static bool  read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
+static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
     // Start with a clear matrix row
     matrix_row_t current_row_value = 0;
 
@@ -149,7 +149,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
     // For each row...
     for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) {
         // Store last value of row prior to reading
-        matrix_row_t last_row_value = current_matrix[row_index];
+        matrix_row_t last_row_value    = current_matrix[row_index];
         matrix_row_t current_row_value = last_row_value;
 
         // Check row pin state
diff --git a/quantum/split_common/matrix.c b/quantum/split_common/matrix.c
index 27c37d4b00..c3b43020ca 100644
--- a/quantum/split_common/matrix.c
+++ b/quantum/split_common/matrix.c
@@ -106,7 +106,7 @@ static void init_pins(void) {
     }
 }
 
-static bool  read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
+static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
     // Start with a clear matrix row
     matrix_row_t current_row_value = 0;
 
@@ -166,7 +166,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
     // For each row...
     for (uint8_t row_index = 0; row_index < ROWS_PER_HAND; row_index++) {
         // Store last value of row prior to reading
-        matrix_row_t last_row_value = current_matrix[row_index];
+        matrix_row_t last_row_value    = current_matrix[row_index];
         matrix_row_t current_row_value = last_row_value;
 
         // Check row pin state