diff --git a/AMS_Master_Code/.clang-tidy b/AMS_Master_Code/.clang-tidy
new file mode 100644
index 0000000..a234aba
--- /dev/null
+++ b/AMS_Master_Code/.clang-tidy
@@ -0,0 +1,2 @@
+Checks: 'clang-diagnostic-*,
+        clang-analyzer-*,'
\ No newline at end of file
diff --git a/AMS_Master_Code/Core/Lib/ADBMS6830B_Driver/Core/Inc/ADBMS_LL_Driver.h b/AMS_Master_Code/Core/Lib/ADBMS6830B_Driver/Core/Inc/ADBMS_LL_Driver.h
index 766d944..73a0156 100644
--- a/AMS_Master_Code/Core/Lib/ADBMS6830B_Driver/Core/Inc/ADBMS_LL_Driver.h
+++ b/AMS_Master_Code/Core/Lib/ADBMS6830B_Driver/Core/Inc/ADBMS_LL_Driver.h
@@ -17,9 +17,9 @@
 uint8_t adbmsDriverInit(SPI_HandleTypeDef* hspi);
 
 //2 command + 2 PEC + (data + 2 DPEC) per BMS
-#define CMD_BUFFER_SIZE(datalen) (4 + (N_BMS * (datalen + 2)))
+#define CMD_BUFFER_SIZE(datalen) (4 + (N_BMS * ((datalen) + 2)))
 
-#define BUFFER_BMS_OFFSET(bms, datalen) (4 + (bms * (datalen + 2)))
+#define BUFFER_BMS_OFFSET(bms, datalen) (4 + ((bms) * ((datalen) + 2)))
 
 #define CMD_EMPTY_BUFFER ((uint8_t[CMD_BUFFER_SIZE(0)]){0})
 #define CMD_EMPTY_BUFFER_SIZE CMD_BUFFER_SIZE(0)
@@ -49,10 +49,6 @@ HAL_StatusTypeDef __pollCMD(uint16_t command, uint8_t waitTime);
 #define pollCMD(command) \
   __pollCMD(command, (N_BMS * 2) + 1) //poll is only valid after 2 * N_BMS clock cycles, +1 for safety, see datasheet page 55
 
-
-void mcuAdbmsCSLow();
-void mcuAdbmsCSHigh();
-
 uint8_t wakeUpCmd();
 static inline void mcuDelay(uint16_t delay) { HAL_Delay(delay); };
 
diff --git a/AMS_Master_Code/Core/Lib/ADBMS6830B_Driver/Core/Src/ADBMS_HighLevel.c b/AMS_Master_Code/Core/Lib/ADBMS6830B_Driver/Core/Src/ADBMS_HighLevel.c
index 663af63..e30a1ed 100644
--- a/AMS_Master_Code/Core/Lib/ADBMS6830B_Driver/Core/Src/ADBMS_HighLevel.c
+++ b/AMS_Master_Code/Core/Lib/ADBMS6830B_Driver/Core/Src/ADBMS_HighLevel.c
@@ -8,8 +8,6 @@
 #include "ADBMS_HighLevel.h"
 #include "ADBMS_Abstraction.h"
 #include "ADBMS_Driver.h"
-#include "ADBMS_Error.h"
-#include "ADBMS_LL_Driver.h"
 #include "config_ADBMS6830.h"
 #include "stm32h7xx_hal.h"
 #include "swo_log.h"
diff --git a/AMS_Master_Code/Core/Lib/ADBMS6830B_Driver/Core/Src/ADBMS_LL_Driver.c b/AMS_Master_Code/Core/Lib/ADBMS6830B_Driver/Core/Src/ADBMS_LL_Driver.c
index fce5053..a35c61c 100644
--- a/AMS_Master_Code/Core/Lib/ADBMS6830B_Driver/Core/Src/ADBMS_LL_Driver.c
+++ b/AMS_Master_Code/Core/Lib/ADBMS6830B_Driver/Core/Src/ADBMS_LL_Driver.c
@@ -7,7 +7,6 @@
 
 #include "ADBMS_LL_Driver.h"
 #include "config_ADBMS6830.h"
-#include "main.h"
 #include "stm32h7xx_hal.h"
 #include "swo_log.h"
 #include <stdint.h>