diff --git a/lib/python/qmk/xap/gen_firmware/inline_generator.py b/lib/python/qmk/xap/gen_firmware/inline_generator.py
index 756b0e8666..5d8f10a12b 100755
--- a/lib/python/qmk/xap/gen_firmware/inline_generator.py
+++ b/lib/python/qmk/xap/gen_firmware/inline_generator.py
@@ -1,7 +1,5 @@
 """This script generates the XAP protocol generated header to be compiled into QMK.
 """
-import pyhash
-
 from qmk.casing import to_snake
 from qmk.constants import GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE
 from qmk.xap.common import latest_xap_defs, route_conditions
diff --git a/quantum/xap/xap.c b/quantum/xap/xap.c
index df25f799d5..185213c833 100644
--- a/quantum/xap/xap.c
+++ b/quantum/xap/xap.c
@@ -22,7 +22,7 @@
 #define QSTR(z) QSTR2(z)
 
 typedef enum xap_route_type_t {
-    XAP_UNUSED = 0,  // "Unused" needs to be zero -- undefined routes (through preprocessor) will be skipped
+    XAP_UNUSED = 0, // "Unused" needs to be zero -- undefined routes (through preprocessor) will be skipped
     XAP_ROUTE,
     XAP_EXECUTE,
     XAP_VALUE,
@@ -113,4 +113,6 @@ void xap_execute_route(xap_token_t token, const xap_route_t *routes, size_t max_
     xap_respond_failure(token, XAP_RESPONSE_FLAG_FAILED);
 }
 
-void xap_receive(xap_token_t token, const uint8_t *data, size_t length) { xap_execute_route(token, xap_route_table, sizeof(xap_route_table) / sizeof(xap_route_t), data, length); }
+void xap_receive(xap_token_t token, const uint8_t *data, size_t length) {
+    xap_execute_route(token, xap_route_table, sizeof(xap_route_table) / sizeof(xap_route_t), data, length);
+}
diff --git a/quantum/xap/xap_handlers.c b/quantum/xap/xap_handlers.c
index 7c3d8127ce..492d3d25bc 100644
--- a/quantum/xap/xap_handlers.c
+++ b/quantum/xap/xap_handlers.c
@@ -18,7 +18,9 @@
 #include <xap.h>
 #include <info_json_gz.h>
 
-void xap_respond_failure(xap_token_t token, xap_response_flags_t response_flags) { xap_send(token, response_flags, NULL, 0); }
+void xap_respond_failure(xap_token_t token, xap_response_flags_t response_flags) {
+    xap_send(token, response_flags, NULL, 0);
+}
 
 bool xap_respond_data(xap_token_t token, const void *data, size_t length) {
     xap_send(token, XAP_RESPONSE_FLAG_SUCCESS, data, length);
@@ -36,4 +38,6 @@ bool xap_respond_u32(xap_token_t token, uint32_t value) {
     return true;
 }
 
-uint32_t xap_route_qmk_ffffffffffffffff_getter(void) { return 0x12345678; }
+uint32_t xap_route_qmk_ffffffffffffffff_getter(void) {
+    return 0x12345678;
+}
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index 47c3d30c3c..0dcf1036c4 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -293,7 +293,7 @@ static void xap_task(void) {
         }
     }
 }
-#endif  // XAP_ENABLE
+#endif // XAP_ENABLE
 
 /*******************************************************************************
  * Console
@@ -561,7 +561,7 @@ void EVENT_USB_Device_ConfigurationChanged(void) {
     /* Setup XAP endpoints */
     ConfigSuccess &= Endpoint_ConfigureEndpoint((XAP_IN_EPNUM | ENDPOINT_DIR_IN), EP_TYPE_INTERRUPT, XAP_EPSIZE, 1);
     ConfigSuccess &= Endpoint_ConfigureEndpoint((XAP_OUT_EPNUM | ENDPOINT_DIR_OUT), EP_TYPE_INTERRUPT, XAP_EPSIZE, 1);
-#endif  // XAP_ENABLE
+#endif // XAP_ENABLE
 
 #ifdef CONSOLE_ENABLE
     /* Setup console endpoint */
@@ -1189,7 +1189,7 @@ void protocol_post_task(void) {
 #endif
 
 #ifdef XAP_ENABLE
-        xap_task();
+    xap_task();
 #endif
 
 #if !defined(INTERRUPT_CONTROL_ENDPOINT)