diff --git a/src/main/fc/fc_msp.c b/src/main/fc/fc_msp.c
index 6c75c458b4..40eecb6fce 100755
--- a/src/main/fc/fc_msp.c
+++ b/src/main/fc/fc_msp.c
@@ -262,10 +262,8 @@ static void serializeNames(sbuf_t *dst, const char *s)
 
 static const box_t *findBoxByActiveBoxId(uint8_t activeBoxId)
 {
-    uint8_t boxIndex;
-    const box_t *candidate;
-    for (boxIndex = 0; boxIndex < sizeof(boxes) / sizeof(box_t); boxIndex++) {
-        candidate = &boxes[boxIndex];
+    for (uint8_t boxIndex = 0; boxIndex < sizeof(boxes) / sizeof(box_t); boxIndex++) {
+        const box_t *candidate = &boxes[boxIndex];
         if (candidate->boxId == activeBoxId) {
             return candidate;
         }
@@ -275,10 +273,8 @@ static const box_t *findBoxByActiveBoxId(uint8_t activeBoxId)
 
 static const box_t *findBoxByPermenantId(uint8_t permenantId)
 {
-    uint8_t boxIndex;
-    const box_t *candidate;
-    for (boxIndex = 0; boxIndex < sizeof(boxes) / sizeof(box_t); boxIndex++) {
-        candidate = &boxes[boxIndex];
+    for (uint8_t boxIndex = 0; boxIndex < sizeof(boxes) / sizeof(box_t); boxIndex++) {
+        const box_t *candidate = &boxes[boxIndex];
         if (candidate->permanentId == permenantId) {
             return candidate;
         }
@@ -1418,7 +1414,6 @@ static mspResult_e mspFcProcessInCommand(uint8_t cmdMSP, sbuf_t *src)
 #ifdef USE_SERVOS
         if (dataSize != 1 + sizeof(servoParam_t)) {
             return MSP_RESULT_ERROR;
-            break;
         }
         i = sbufReadU8(src);
         if (i >= MAX_SUPPORTED_SERVOS) {
@@ -1572,7 +1567,6 @@ static mspResult_e mspFcProcessInCommand(uint8_t cmdMSP, sbuf_t *src)
     case MSP_SET_TRANSPONDER_CONFIG:
         if (dataSize != sizeof(masterConfig.transponderData)) {
             return MSP_RESULT_ERROR;
-            break;
         }
         for (unsigned int i = 0; i < sizeof(masterConfig.transponderData); i++) {
             masterConfig.transponderData[i] = sbufReadU8(src);
diff --git a/src/main/fc/fc_tasks.c b/src/main/fc/fc_tasks.c
index 528780e96c..1b4005fa61 100644
--- a/src/main/fc/fc_tasks.c
+++ b/src/main/fc/fc_tasks.c
@@ -110,8 +110,8 @@ static void taskHandleSerial(timeUs_t currentTimeUs)
 static void taskUpdateBattery(timeUs_t currentTimeUs)
 {
 #if defined(USE_ADC) || defined(USE_ESC_SENSOR)
-    static uint32_t vbatLastServiced = 0;
     if (feature(FEATURE_VBAT) || feature(FEATURE_ESC_SENSOR)) {
+        static uint32_t vbatLastServiced = 0;
         if (cmp32(currentTimeUs, vbatLastServiced) >= VBATINTERVAL) {
             vbatLastServiced = currentTimeUs;
             updateBattery();
@@ -119,8 +119,8 @@ static void taskUpdateBattery(timeUs_t currentTimeUs)
     }
 #endif
 
-    static uint32_t ibatLastServiced = 0;
     if (feature(FEATURE_CURRENT_METER) || feature(FEATURE_ESC_SENSOR)) {
+        static uint32_t ibatLastServiced = 0;
         const int32_t ibatTimeSinceLastServiced = cmp32(currentTimeUs, ibatLastServiced);
 
         if (ibatTimeSinceLastServiced >= IBATINTERVAL) {
diff --git a/src/main/io/ledstrip.c b/src/main/io/ledstrip.c
index 7fa0ce9199..a67db84ffb 100644
--- a/src/main/io/ledstrip.c
+++ b/src/main/io/ledstrip.c
@@ -568,13 +568,11 @@ static void applyLedBatteryLayer(bool updateNow, timeUs_t *timer)
 {
     static bool flash = false;
 
-    int state;
     int timerDelayUs = HZ_TO_US(1);
 
     if (updateNow) {
-       state = getBatteryState();
 
-        switch (state) {
+        switch (getBatteryState()) {
             case BATTERY_OK:
                 flash = true;
                 timerDelayUs = HZ_TO_US(1);
@@ -605,40 +603,40 @@ static void applyLedRssiLayer(bool updateNow, timeUs_t *timer)
 {
     static bool flash = false;
 
-    int state;
     int timerDelay = HZ_TO_US(1);
 
     if (updateNow) {
-       state = (rssi * 100) / 1023;
+        int state = (rssi * 100) / 1023;
 
-       if (state > 50) {
-           flash = true;
-           timerDelay = HZ_TO_US(1);
-       } else if (state > 20) {
-           flash = !flash;
-           timerDelay = HZ_TO_US(2);
-       } else {
-           flash = !flash;
-           timerDelay = HZ_TO_US(8);
-       }
+        if (state > 50) {
+            flash = true;
+            timerDelay = HZ_TO_US(1);
+        } else if (state > 20) {
+            flash = !flash;
+            timerDelay = HZ_TO_US(2);
+        } else {
+            flash = !flash;
+            timerDelay = HZ_TO_US(8);
+        }
     }
 
     *timer += timerDelay;
 
     if (!flash) {
-       hsvColor_t *bgc = getSC(LED_SCOLOR_BACKGROUND);
-       applyLedHsv(LED_MOV_FUNCTION(LED_FUNCTION_RSSI), bgc);
+        hsvColor_t *bgc = getSC(LED_SCOLOR_BACKGROUND);
+        applyLedHsv(LED_MOV_FUNCTION(LED_FUNCTION_RSSI), bgc);
     }
 }
 
 #ifdef GPS
 static void applyLedGpsLayer(bool updateNow, timeUs_t *timer)
 {
-    static uint8_t gpsFlashCounter = 0;
+
     static uint8_t gpsPauseCounter = 0;
     const uint8_t blinkPauseLength = 4;
 
     if (updateNow) {
+        static uint8_t gpsFlashCounter = 0;
         if (gpsPauseCounter > 0) {
             gpsPauseCounter--;
         } else if (gpsFlashCounter >= GPS_numSat) {