diff --git a/Marlin/src/HAL/LPC1768/HAL_SPI.cpp b/Marlin/src/HAL/LPC1768/HAL_SPI.cpp
index 3c64ea812..e13f2d98c 100644
--- a/Marlin/src/HAL/LPC1768/HAL_SPI.cpp
+++ b/Marlin/src/HAL/LPC1768/HAL_SPI.cpp
@@ -370,19 +370,19 @@ void SPIClass::updateSettings() {
   switch (_currentSetting->dataMode) {
     case SPI_MODE0:
       HW_SPI_init.CPHA = SSP_CPHA_FIRST;
-	    HW_SPI_init.CPOL = SSP_CPOL_HI;
+      HW_SPI_init.CPOL = SSP_CPOL_HI;
       break;
     case SPI_MODE1:
       HW_SPI_init.CPHA = SSP_CPHA_SECOND;
-	    HW_SPI_init.CPOL = SSP_CPOL_HI;
+      HW_SPI_init.CPOL = SSP_CPOL_HI;
       break;
     case SPI_MODE2:
       HW_SPI_init.CPHA = SSP_CPHA_FIRST;
-	    HW_SPI_init.CPOL = SSP_CPOL_LO;
+      HW_SPI_init.CPOL = SSP_CPOL_LO;
       break;
     case SPI_MODE3:
       HW_SPI_init.CPHA = SSP_CPHA_SECOND;
-	    HW_SPI_init.CPOL = SSP_CPOL_LO;
+      HW_SPI_init.CPOL = SSP_CPOL_LO;
       break;
     default:
       break;
diff --git a/Marlin/src/HAL/STM32F1/sdio.cpp b/Marlin/src/HAL/STM32F1/sdio.cpp
index 0e8a74581..0e9a3b2d0 100644
--- a/Marlin/src/HAL/STM32F1/sdio.cpp
+++ b/Marlin/src/HAL/STM32F1/sdio.cpp
@@ -108,7 +108,7 @@ bool SDIO_ReadBlock_DMA(uint32_t blockAddress, uint8_t *data) {
     SDIO_CLEAR_FLAG(SDIO_ICR_CMD_FLAGS | SDIO_ICR_DATA_FLAGS);
     dma_disable(SDIO_DMA_DEV, SDIO_DMA_CHANNEL);
     return false;
-	}
+  }
 
   //Wait for DMA transaction to complete
   while ((DMA2_BASE->ISR & (DMA_ISR_TEIF4|DMA_ISR_TCIF4)) == 0 ) { /* wait */ }
diff --git a/Marlin/src/gcode/motion/G2_G3.cpp b/Marlin/src/gcode/motion/G2_G3.cpp
index 59a534635..61d9f1d3a 100644
--- a/Marlin/src/gcode/motion/G2_G3.cpp
+++ b/Marlin/src/gcode/motion/G2_G3.cpp
@@ -115,9 +115,7 @@ void plan_arc(
   );
   // Divide total travel by nominal segment length
   uint16_t segments = FLOOR(mm_of_travel / seg_length);
-  if (segments < min_segments) {            // Too few segments?
-    segments = min_segments;                // More segments
-  }
+  NOLESS(segments, min_segments);         // At least some segments
   seg_length = mm_of_travel / segments;
 
   /**
diff --git a/Marlin/src/lcd/dwin/e3v2/rotary_encoder.cpp b/Marlin/src/lcd/dwin/e3v2/rotary_encoder.cpp
index e4c563cf6..82a1bcae2 100644
--- a/Marlin/src/lcd/dwin/e3v2/rotary_encoder.cpp
+++ b/Marlin/src/lcd/dwin/e3v2/rotary_encoder.cpp
@@ -127,15 +127,15 @@ ENCODER_DiffState Encoder_ReceiveAnalyze(void) {
 
       // if must encoder rati multiplier
       if (EncoderRate.encoderRateEnabled) {
-        const float abs_diff = ABS(temp_diff);
-        const float encoderMovementSteps = abs_diff / (ENCODER_PULSES_PER_STEP);
+        const float abs_diff = ABS(temp_diff),
+                    encoderMovementSteps = abs_diff / (ENCODER_PULSES_PER_STEP);
         if (EncoderRate.lastEncoderTime) {
           // Note that the rate is always calculated between two passes through the
           // loop and that the abs of the temp_diff value is tracked.
           const float encoderStepRate = encoderMovementSteps / float(ms - EncoderRate.lastEncoderTime) * 1000;
-          if (encoderStepRate >= ENCODER_100X_STEPS_PER_SEC)  encoderMultiplier = 100;
-          else if (encoderStepRate >= ENCODER_10X_STEPS_PER_SEC) encoderMultiplier = 10;
-          else if (encoderStepRate >= ENCODER_5X_STEPS_PER_SEC) encoderMultiplier = 5;
+               if (encoderStepRate >= ENCODER_100X_STEPS_PER_SEC) encoderMultiplier = 100;
+          else if (encoderStepRate >= ENCODER_10X_STEPS_PER_SEC)  encoderMultiplier = 10;
+          else if (encoderStepRate >= ENCODER_5X_STEPS_PER_SEC)   encoderMultiplier = 5;
         }
         EncoderRate.lastEncoderTime = ms;
       }
diff --git a/Marlin/src/lcd/dwin/e3v2/rotary_encoder.h b/Marlin/src/lcd/dwin/e3v2/rotary_encoder.h
index db074098e..72327725c 100644
--- a/Marlin/src/lcd/dwin/e3v2/rotary_encoder.h
+++ b/Marlin/src/lcd/dwin/e3v2/rotary_encoder.h
@@ -55,9 +55,9 @@ extern ENCODER_Rate EncoderRate;
 
 typedef enum {
   ENCODER_DIFF_NO    = 0,
-	ENCODER_DIFF_CW    = 1,
+  ENCODER_DIFF_CW    = 1,
   ENCODER_DIFF_CCW   = 2,
-	ENCODER_DIFF_ENTER = 3
+  ENCODER_DIFF_ENTER = 3
 } ENCODER_DiffState;
 
 /*编码器初始化 PB12:Encoder_A PB13:Encoder_B PB14:Encoder_C*/
@@ -87,7 +87,7 @@ ENCODER_DiffState Encoder_ReceiveAnalyze(void);
   /*状态LED初始化*/
   void STATE_LED_Configuration(void);
 
-	/*LED灯操作*/
+  /*LED灯操作*/
   void LED_Action(void);
 
   /*LED初始化*/
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
index 090f3ee3f..f122a2b7c 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
@@ -161,7 +161,7 @@
 
 #if ENABLED(RET6_12864_LCD)
 
-  /* RET6 12864 LCD */
+  // RET6 12864 LCD
   #define LCD_PINS_RS                       PB12
   #define LCD_PINS_ENABLE                   PB15
   #define LCD_PINS_D4                       PB13
@@ -174,7 +174,7 @@
 
 #elif ENABLED(VET6_12864_LCD)
 
-  /* VET6 12864 LCD */
+  // VET6 12864 LCD
   #define LCD_PINS_RS                       PA4
   #define LCD_PINS_ENABLE                   PA7
   #define LCD_PINS_D4                       PA5
@@ -185,7 +185,7 @@
 
 #elif ENABLED(DWIN_CREALITY_LCD)
 
-  /* RET6 DWIN ENCODER LCD */
+  // RET6 DWIN ENCODER LCD
   #define BTN_ENC                           PB14
   #define BTN_EN1                           PB15
   #define BTN_EN2                           PB12
@@ -198,7 +198,7 @@
 
 #elif ENABLED(DWIN_VET6_CREALITY_LCD)
 
-  /* VET6 DWIN ENCODER LCD */
+  // VET6 DWIN ENCODER LCD
   #define BTN_ENC                           PA6
   #define BTN_EN1                           PA7
   #define BTN_EN2                           PA4