diff --git a/source/Core/BSP/MHP30/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c b/source/Core/BSP/MHP30/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c
index f9616265..fd96debc 100644
--- a/source/Core/BSP/MHP30/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c
+++ b/source/Core/BSP/MHP30/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c
@@ -175,11 +175,11 @@
  * @retval None
  */
 void HAL_GPIO_Init(GPIO_TypeDef *GPIOx, GPIO_InitTypeDef *GPIO_Init) {
-  uint32_t position = 0x00u;
-  uint32_t ioposition;
-  uint32_t iocurrent;
-  uint32_t temp;
-  uint32_t config = 0x00u;
+  uint32_t       position = 0x00u;
+  uint32_t       ioposition;
+  uint32_t       iocurrent;
+  uint32_t       temp;
+  uint32_t       config = 0x00u;
   __IO uint32_t *configregister; /* Store the address of CRL or CRH register based on pin number */
   uint32_t       registeroffset; /* offset used during computation of CNF and MODE bits placement inside CRL or CRH register */
 
@@ -326,9 +326,9 @@ void HAL_GPIO_Init(GPIO_TypeDef *GPIOx, GPIO_InitTypeDef *GPIO_Init) {
  * @retval None
  */
 void HAL_GPIO_DeInit(GPIO_TypeDef *GPIOx, uint32_t GPIO_Pin) {
-  uint32_t position = 0x00u;
-  uint32_t iocurrent;
-  uint32_t tmp;
+  uint32_t       position = 0x00u;
+  uint32_t       iocurrent;
+  uint32_t       tmp;
   __IO uint32_t *configregister; /* Store the address of CRL or CRH register based on pin number */
   uint32_t       registeroffset;
 
diff --git a/source/Core/BSP/Pinecil/Vendor/SoC/gd32vf103/Common/Source/Drivers/Usb/drv_usbh_int.c b/source/Core/BSP/Pinecil/Vendor/SoC/gd32vf103/Common/Source/Drivers/Usb/drv_usbh_int.c
index abbec3cd..3347966e 100644
--- a/source/Core/BSP/Pinecil/Vendor/SoC/gd32vf103/Common/Source/Drivers/Usb/drv_usbh_int.c
+++ b/source/Core/BSP/Pinecil/Vendor/SoC/gd32vf103/Common/Source/Drivers/Usb/drv_usbh_int.c
@@ -151,8 +151,8 @@ static uint32_t usbh_int_pipe(usb_core_driver *pudev) {
     \retval     operation status
 */
 static uint32_t usbh_int_txfifoempty(usb_core_driver *pudev, usb_pipe_mode pp_mode) {
-  uint8_t  pp_num     = 0U;
-  uint16_t word_count = 0U, len = 0U;
+  uint8_t        pp_num     = 0U;
+  uint16_t       word_count = 0U, len = 0U;
   __IO uint32_t *txfiforeg = 0U, txfifostate = 0U;
 
   if (PIPE_NON_PERIOD == pp_mode) {
diff --git a/source/Core/Drivers/OLED.cpp b/source/Core/Drivers/OLED.cpp
index dee5d0a4..b9a8a851 100644
--- a/source/Core/Drivers/OLED.cpp
+++ b/source/Core/Drivers/OLED.cpp
@@ -221,7 +221,7 @@ void OLED::maskScrollIndicatorOnOLED() {
   // it from the screen buffer which is updated by `OLED::setRotation`.
   uint8_t rightmostColumn = screenBuffer[7];
   uint8_t maskCommands[]  = {
-       // Set column address:
+      // Set column address:
       //  A[6:0] - Column start address = rightmost column
       //  B[6:0] - Column end address = rightmost column
       0x80,
diff --git a/source/Core/Drivers/USBPD.cpp b/source/Core/Drivers/USBPD.cpp
index 2111bf32..f8172809 100644
--- a/source/Core/Drivers/USBPD.cpp
+++ b/source/Core/Drivers/USBPD.cpp
@@ -46,7 +46,7 @@ void    USBPowerDelivery::IRQOccured() { pe.IRQOccured(); }
 bool    USBPowerDelivery::negotiationHasWorked() { return pe.pdHasNegotiated(); }
 uint8_t USBPowerDelivery::getStateNumber() { return pe.currentStateCode(true); }
 void    USBPowerDelivery::step() {
-     while (pe.thread()) {}
+  while (pe.thread()) {}
 }
 
 void USBPowerDelivery::PPSTimerCallback() { pe.TimersCallback(); }
diff --git a/source/Core/Threads/GUIThread.cpp b/source/Core/Threads/GUIThread.cpp
index fc68b989..dd322d55 100644
--- a/source/Core/Threads/GUIThread.cpp
+++ b/source/Core/Threads/GUIThread.cpp
@@ -42,7 +42,7 @@ void              showWarnings();
 #define BUTTON_INACTIVITY_TIME   (60 * configTICK_RATE_HZ)
 static TickType_t lastHallEffectSleepStart = 0;
 static uint16_t   min(uint16_t a, uint16_t b) {
-    if (a > b)
+  if (a > b)
     return b;
   else
     return a;
@@ -997,10 +997,8 @@ void startGUITask(void const *argument) {
 #endif
 #endif
   // If the boot logo is enabled (but it times out) and the autostart mode is enabled (but not set to sleep w/o heat), start heating during boot logo
-  if (getSettingValue(SettingsOptions::LOGOTime) > 0 &&
-      getSettingValue(SettingsOptions::LOGOTime) < 5 &&
-      getSettingValue(SettingsOptions::AutoStartMode) > 0 &&
-      getSettingValue(SettingsOptions::AutoStartMode) < 3) {
+  if (getSettingValue(SettingsOptions::LOGOTime) > 0 && getSettingValue(SettingsOptions::LOGOTime) < 5 && getSettingValue(SettingsOptions::AutoStartMode) > 0
+      && getSettingValue(SettingsOptions::AutoStartMode) < 3) {
     uint16_t sleepTempDegC;
     if (getSettingValue(SettingsOptions::TemperatureInF)) {
       sleepTempDegC = TipThermoModel::convertFtoC(getSettingValue(SettingsOptions::SleepTemp));
@@ -1011,7 +1009,6 @@ void startGUITask(void const *argument) {
     currentTempTargetDegC = min(sleepTempDegC, 75);
   }
 
-
   BootLogo::handleShowingLogo((uint8_t *)FLASH_LOGOADDR);
 
   showWarnings();