diff --git a/src/main/target/ALIENFLIGHTF3/target.mk b/src/main/target/ALIENFLIGHTF3/target.mk
index 8c802ecd8..fc9d28c28 100644
--- a/src/main/target/ALIENFLIGHTF3/target.mk
+++ b/src/main/target/ALIENFLIGHTF3/target.mk
@@ -1,5 +1,5 @@
+F3_TARGETS  += $(TARGET)
 FEATURES    = VCP
-F3_TARGETS += $(TARGET)
 
 TARGET_SRC = \
             drivers/accgyro_mpu.c \
@@ -9,4 +9,5 @@ TARGET_SRC = \
             drivers/accgyro_spi_mpu6500.c \
             drivers/compass_ak8963.c \
             hardware_revision.c \
-            drivers/sonar_hcsr04.c 
+            drivers/sonar_hcsr04.c
+
diff --git a/src/main/target/ALIENFLIGHTF4/target.mk b/src/main/target/ALIENFLIGHTF4/target.mk
index b3c825022..54a4c3108 100644
--- a/src/main/target/ALIENFLIGHTF4/target.mk
+++ b/src/main/target/ALIENFLIGHTF4/target.mk
@@ -1,5 +1,5 @@
-F405_TARGETS   += $(TARGET)
-FEATURES       += SDCARD VCP
+F405_TARGETS    += $(TARGET)
+FEATURES        += SDCARD VCP
 
 TARGET_SRC = \
             drivers/accgyro_mpu6500.c \
@@ -10,4 +10,5 @@ TARGET_SRC = \
             drivers/compass_ak8963.c \
             drivers/compass_hmc5883l.c \
             drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f4xx.c 
+            drivers/light_ws2811strip_stm32f4xx.c
+
diff --git a/src/main/target/BLUEJAYF4/target.mk b/src/main/target/BLUEJAYF4/target.mk
index d511472a5..9f2308666 100644
--- a/src/main/target/BLUEJAYF4/target.mk
+++ b/src/main/target/BLUEJAYF4/target.mk
@@ -1,7 +1,8 @@
-F405_TARGETS   += $(TARGET)
-FEATURES       += SDCARD VCP
+F405_TARGETS    += $(TARGET)
+FEATURES        += SDCARD VCP
 
 TARGET_SRC = \
             drivers/accgyro_spi_mpu6500.c \
             drivers/accgyro_mpu6500.c \
-            drivers/barometer_ms5611.c 
+            drivers/barometer_ms5611.c
+
diff --git a/src/main/target/CC3D/target.mk b/src/main/target/CC3D/target.mk
index 238eb4906..2718c0302 100644
--- a/src/main/target/CC3D/target.mk
+++ b/src/main/target/CC3D/target.mk
@@ -1,5 +1,5 @@
-FEATURES     = ONBOARDFLASH HIGHEND VCP
 F1_TARGETS  += $(TARGET)
+FEATURES    = ONBOARDFLASH HIGHEND VCP
 
 TARGET_SRC = \
             drivers/accgyro_mpu.c \
@@ -10,4 +10,5 @@ TARGET_SRC = \
             drivers/compass_hmc5883l.c \
             drivers/light_ws2811strip.c \
             drivers/light_ws2811strip_stm32f10x.c \
-            drivers/sonar_hcsr04.c 
+            drivers/sonar_hcsr04.c
+
diff --git a/src/main/target/CHEBUZZF3/target.mk b/src/main/target/CHEBUZZF3/target.mk
index 8f0ecfe74..e90db6d09 100644
--- a/src/main/target/CHEBUZZF3/target.mk
+++ b/src/main/target/CHEBUZZF3/target.mk
@@ -1,5 +1,5 @@
+F3_TARGETS  += $(TARGET)
 FEATURES    = VCP SDCARD
-F3_TARGETS += $(TARGET)
 
 TARGET_SRC = \
             drivers/light_ws2811strip.c \
@@ -15,4 +15,5 @@ TARGET_SRC = \
             drivers/accgyro_l3g4200d.c \
             drivers/barometer_ms5611.c \
             drivers/barometer_bmp280.c \
-            drivers/compass_ak8975.c 
+            drivers/compass_ak8975.c
+
diff --git a/src/main/target/CJMCU/target.mk b/src/main/target/CJMCU/target.mk
index 64a0ebfc0..5aa48e4f2 100644
--- a/src/main/target/CJMCU/target.mk
+++ b/src/main/target/CJMCU/target.mk
@@ -1,5 +1,5 @@
-FLASH_SIZE = 64
-F1_TARGETS += $(TARGET)
+F1_TARGETS  += $(TARGET)
+FLASH_SIZE  = 64
 
 TARGET_SRC = \
             drivers/accgyro_mpu.c \
@@ -8,4 +8,5 @@ TARGET_SRC = \
             hardware_revision.c \
             flight/gtune.c \
             blackbox/blackbox.c \
-            blackbox/blackbox_io.c 
+            blackbox/blackbox_io.c
+
diff --git a/src/main/target/COLIBRI_RACE/target.mk b/src/main/target/COLIBRI_RACE/target.mk
index e029261d0..315800073 100644
--- a/src/main/target/COLIBRI_RACE/target.mk
+++ b/src/main/target/COLIBRI_RACE/target.mk
@@ -1,5 +1,5 @@
-FEATURES     = VCP 
 F3_TARGETS  += $(TARGET)
+FEATURES    = VCP 
 
 TARGET_SRC = \
             io/i2c_bst.c \
@@ -14,4 +14,5 @@ TARGET_SRC = \
             drivers/compass_ak8975.c \
             drivers/compass_hmc5883l.c \
             drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c 
+            drivers/light_ws2811strip_stm32f30x.c
+
diff --git a/src/main/target/DOGE/target.mk b/src/main/target/DOGE/target.mk
index 47c076c14..529ed9f58 100644
--- a/src/main/target/DOGE/target.mk
+++ b/src/main/target/DOGE/target.mk
@@ -1,5 +1,5 @@
-FEATURES     = VCP 
 F3_TARGETS  += $(TARGET)
+FEATURES    = VCP 
 
 TARGET_SRC = \
             drivers/accgyro_mpu.c \
@@ -8,8 +8,5 @@ TARGET_SRC = \
             drivers/barometer_bmp280.c \
             drivers/barometer_spi_bmp280.c \
             drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c 
-
-
-
+            drivers/light_ws2811strip_stm32f30x.c
 
diff --git a/src/main/target/EUSTM32F103RC/target.c b/src/main/target/EUSTM32F103RC/target.c
index ce76839dd..99b0b1003 100644
--- a/src/main/target/EUSTM32F103RC/target.c
+++ b/src/main/target/EUSTM32F103RC/target.c
@@ -72,19 +72,19 @@ const uint16_t airPWM[] = {
 };
 
 const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
-    { TIM2, GPIOA, Pin_0, TIM_Channel_1, TIM2_IRQn, 0, Mode_IPD},          // PWM1 - RC1
-    { TIM2, GPIOA, Pin_1, TIM_Channel_2, TIM2_IRQn, 0, Mode_IPD},          // PWM2 - RC2
-    { TIM2, GPIOA, Pin_2, TIM_Channel_3, TIM2_IRQn, 0, Mode_IPD},          // PWM3 - RC3
-    { TIM2, GPIOA, Pin_3, TIM_Channel_4, TIM2_IRQn, 0, Mode_IPD},          // PWM4 - RC4
-    { TIM3, GPIOA, Pin_6, TIM_Channel_1, TIM3_IRQn, 0, Mode_IPD},          // PWM5 - RC5
-    { TIM3, GPIOA, Pin_7, TIM_Channel_2, TIM3_IRQn, 0, Mode_IPD},          // PWM6 - RC6
-    { TIM3, GPIOB, Pin_0, TIM_Channel_3, TIM3_IRQn, 0, Mode_IPD},          // PWM7 - RC7
-    { TIM3, GPIOB, Pin_1, TIM_Channel_4, TIM3_IRQn, 0, Mode_IPD},          // PWM8 - RC8
-    { TIM1, GPIOA, Pin_8, TIM_Channel_1, TIM1_CC_IRQn, 1, Mode_IPD},       // PWM9 - OUT1
-    { TIM1, GPIOA, Pin_11, TIM_Channel_4, TIM1_CC_IRQn, 1, Mode_IPD},      // PWM10 - OUT2
-    { TIM4, GPIOB, Pin_6, TIM_Channel_1, TIM4_IRQn, 0, Mode_IPD},          // PWM11 - OUT3
-    { TIM4, GPIOB, Pin_7, TIM_Channel_2, TIM4_IRQn, 0, Mode_IPD},          // PWM12 - OUT4
-    { TIM4, GPIOB, Pin_8, TIM_Channel_3, TIM4_IRQn, 0, Mode_IPD},          // PWM13 - OUT5
-    { TIM4, GPIOB, Pin_9, TIM_Channel_4, TIM4_IRQn, 0, Mode_IPD}           // PWM14 - OUT6
+    { TIM2, GPIOA, Pin_0, TIM_Channel_1, TIM2_IRQn, 0, Mode_IPD, 0 },          // PWM1 - RC1
+    { TIM2, GPIOA, Pin_1, TIM_Channel_2, TIM2_IRQn, 0, Mode_IPD, 0 },          // PWM2 - RC2
+    { TIM2, GPIOA, Pin_2, TIM_Channel_3, TIM2_IRQn, 0, Mode_IPD, 0 },          // PWM3 - RC3
+    { TIM2, GPIOA, Pin_3, TIM_Channel_4, TIM2_IRQn, 0, Mode_IPD, 0 },          // PWM4 - RC4
+    { TIM3, GPIOA, Pin_6, TIM_Channel_1, TIM3_IRQn, 0, Mode_IPD, 0 },          // PWM5 - RC5
+    { TIM3, GPIOA, Pin_7, TIM_Channel_2, TIM3_IRQn, 0, Mode_IPD, 0 },          // PWM6 - RC6
+    { TIM3, GPIOB, Pin_0, TIM_Channel_3, TIM3_IRQn, 0, Mode_IPD, 0 },          // PWM7 - RC7
+    { TIM3, GPIOB, Pin_1, TIM_Channel_4, TIM3_IRQn, 0, Mode_IPD, 0 },          // PWM8 - RC8
+    { TIM1, GPIOA, Pin_8, TIM_Channel_1, TIM1_CC_IRQn, 1, Mode_IPD, 0 },       // PWM9 - OUT1
+    { TIM1, GPIOA, Pin_11, TIM_Channel_4, TIM1_CC_IRQn, 1, Mode_IPD, 0 },      // PWM10 - OUT2
+    { TIM4, GPIOB, Pin_6, TIM_Channel_1, TIM4_IRQn, 0, Mode_IPD, 0 },          // PWM11 - OUT3
+    { TIM4, GPIOB, Pin_7, TIM_Channel_2, TIM4_IRQn, 0, Mode_IPD, 0 },          // PWM12 - OUT4
+    { TIM4, GPIOB, Pin_8, TIM_Channel_3, TIM4_IRQn, 0, Mode_IPD, 0 },          // PWM13 - OUT5
+    { TIM4, GPIOB, Pin_9, TIM_Channel_4, TIM4_IRQn, 0, Mode_IPD, 0 }           // PWM14 - OUT6
 };
 
diff --git a/src/main/target/EUSTM32F103RC/target.h b/src/main/target/EUSTM32F103RC/target.h
index d00e6ba58..ef7534c66 100644
--- a/src/main/target/EUSTM32F103RC/target.h
+++ b/src/main/target/EUSTM32F103RC/target.h
@@ -27,12 +27,12 @@
 
 #define USE_EXTI
 #define MPU6000_CS_GPIO       GPIOB
-#define MPU6000_CS_PIN        GPIO_Pin_12
+#define MPU6000_CS_PIN        PB12
 #define MPU6000_SPI_INSTANCE  SPI2
 
 #define MPU6500_CS_GPIO_CLK_PERIPHERAL   RCC_APB2Periph_GPIOB
 #define MPU6500_CS_GPIO       GPIOB
-#define MPU6500_CS_PIN        GPIO_Pin_12
+#define MPU6500_CS_PIN        PB12
 #define MPU6500_SPI_INSTANCE  SPI2
 
 #define GYRO
@@ -109,7 +109,7 @@
 #define EXTERNAL1_ADC_GPIO_PIN      GPIO_Pin_5
 #define EXTERNAL1_ADC_CHANNEL       ADC_Channel_5
 
-#define LED_STRIP
+//#define LED_STRIP
 #define LED_STRIP_TIMER TIM3
 
 #define SPEKTRUM_BIND
diff --git a/src/main/target/EUSTM32F103RC/target.mk b/src/main/target/EUSTM32F103RC/target.mk
index 1801357a0..c12a9fa26 100644
--- a/src/main/target/EUSTM32F103RC/target.mk
+++ b/src/main/target/EUSTM32F103RC/target.mk
@@ -1,5 +1,5 @@
-FEATURES     = ONBOARDFLASH HIGHEND 
 F1_TARGETS  += $(TARGET)
+FEATURES    = ONBOARDFLASH HIGHEND 
 
 DEVICE_FLAGS    = -DSTM32F10X_HD
 
@@ -21,3 +21,4 @@ TARGET_SRC = \
             drivers/light_ws2811strip.c \
             drivers/light_ws2811strip_stm32f10x.c \
             drivers/sonar_hcsr04.c
+
diff --git a/src/main/target/FURYF3/target.mk b/src/main/target/FURYF3/target.mk
index c947d79f2..c68651f01 100644
--- a/src/main/target/FURYF3/target.mk
+++ b/src/main/target/FURYF3/target.mk
@@ -1,5 +1,5 @@
+F3_TARGETS  += $(TARGET)
 FEATURES    = VCP SDCARD ONBOARDFLASH
-F3_TARGETS += $(TARGET)
 
 TARGET_SRC = \
             drivers/accgyro_mpu.c \
@@ -11,5 +11,5 @@ TARGET_SRC = \
             drivers/light_ws2811strip.c \
             drivers/light_ws2811strip_stm32f30x.c \
             drivers/sonar_hcsr04.c \
-            drivers/serial_softserial.c 
+            drivers/serial_softserial.c
 
diff --git a/src/main/target/FURYF4/target.mk b/src/main/target/FURYF4/target.mk
index c6c3a1573..ef12596bc 100644
--- a/src/main/target/FURYF4/target.mk
+++ b/src/main/target/FURYF4/target.mk
@@ -1,8 +1,9 @@
-F405_TARGETS   += $(TARGET)
-FEATURES       += SDCARD VCP
+F405_TARGETS    += $(TARGET)
+FEATURES        += SDCARD VCP
 
 TARGET_SRC = \
             drivers/accgyro_spi_mpu6000.c \
             drivers/accgyro_spi_mpu6500.c \
             drivers/accgyro_mpu6500.c \
-            drivers/barometer_ms5611.c 
+            drivers/barometer_ms5611.c
+
diff --git a/src/main/target/IRCFUSIONF3/target.mk b/src/main/target/IRCFUSIONF3/target.mk
index c58c12fbd..5c10e856b 100644
--- a/src/main/target/IRCFUSIONF3/target.mk
+++ b/src/main/target/IRCFUSIONF3/target.mk
@@ -1,8 +1,9 @@
+F3_TARGETS   += $(TARGET)
 FEATURES     = VCP ONBOARDFLASH
-F3_TARGETS  += $(TARGET)
 TARGET_FLAGS = -DSPRACINGF3
 
 TARGET_SRC = \
             drivers/accgyro_mpu.c \
             drivers/accgyro_mpu6050.c \
-            drivers/barometer_bmp085.c 
\ No newline at end of file
+            drivers/barometer_bmp085.c
+
diff --git a/src/main/target/KISSFC/target.mk b/src/main/target/KISSFC/target.mk
index 6e198e855..56c635c92 100644
--- a/src/main/target/KISSFC/target.mk
+++ b/src/main/target/KISSFC/target.mk
@@ -1,10 +1,8 @@
-FEATURES     = VCP 
 F3_TARGETS  += $(TARGET)
+FEATURES     = VCP 
 
 TARGET_SRC = \
-		   drivers/accgyro_mpu.c \
-		   drivers/display_ug2864hsweg01.c \
-		   drivers/accgyro_mpu6050.c 
-
-
+            drivers/accgyro_mpu.c \
+            drivers/display_ug2864hsweg01.c \
+            drivers/accgyro_mpu6050.c
 
diff --git a/src/main/target/LUX_RACE/target.mk b/src/main/target/LUX_RACE/target.mk
index 186232717..1a77b54ea 100644
--- a/src/main/target/LUX_RACE/target.mk
+++ b/src/main/target/LUX_RACE/target.mk
@@ -1,5 +1,5 @@
-FEATURES     = VCP 
 F3_TARGETS  += $(TARGET)
+FEATURES    = VCP 
 
 TARGET_SRC = \
             drivers/accgyro_mpu.c \
@@ -9,6 +9,3 @@ TARGET_SRC = \
             drivers/light_ws2811strip.c \
             drivers/light_ws2811strip_stm32f30x.c
 
-
-
-
diff --git a/src/main/target/MOTOLAB/target.mk b/src/main/target/MOTOLAB/target.mk
index f2d22aa0e..9dfcb8bb8 100644
--- a/src/main/target/MOTOLAB/target.mk
+++ b/src/main/target/MOTOLAB/target.mk
@@ -1,5 +1,5 @@
-FEATURES     = VCP ONBOARDFLASH
 F3_TARGETS  += $(TARGET)
+FEATURES    = VCP ONBOARDFLASH
 
 TARGET_SRC = \
             drivers/accgyro_mpu.c \
@@ -9,7 +9,5 @@ TARGET_SRC = \
             drivers/compass_hmc5883l.c \
             drivers/light_ws2811strip.c \
             drivers/light_ws2811strip_stm32f30x.c \
-            drivers/serial_softserial.c 
-
-
+            drivers/serial_softserial.c
 
diff --git a/src/main/target/NAZE/target.mk b/src/main/target/NAZE/target.mk
index a73a30ea5..45d87e4b7 100644
--- a/src/main/target/NAZE/target.mk
+++ b/src/main/target/NAZE/target.mk
@@ -1,5 +1,5 @@
-FEATURES     = ONBOARDFLASH HIGHEND 
 F1_TARGETS  += $(TARGET)
+FEATURES    = ONBOARDFLASH HIGHEND 
 
 TARGET_SRC = \
             drivers/accgyro_adxl345.c \
@@ -18,4 +18,4 @@ TARGET_SRC = \
             drivers/light_ws2811strip.c \
             drivers/light_ws2811strip_stm32f10x.c \
             drivers/sonar_hcsr04.c \
-            hardware_revision.c
\ No newline at end of file
+            hardware_revision.c
diff --git a/src/main/target/NAZE32PRO/target.mk b/src/main/target/NAZE32PRO/target.mk
index 7239854ce..3e5fae6ed 100644
--- a/src/main/target/NAZE32PRO/target.mk
+++ b/src/main/target/NAZE32PRO/target.mk
@@ -1,4 +1,4 @@
-FEATURES     = VCP 
 F3_TARGETS  += $(TARGET)
+FEATURES    = VCP 
 
 TARGET_SRC = \
\ No newline at end of file
diff --git a/src/main/target/OLIMEXINO/target.mk b/src/main/target/OLIMEXINO/target.mk
index bda4796ed..b299c9ffd 100644
--- a/src/main/target/OLIMEXINO/target.mk
+++ b/src/main/target/OLIMEXINO/target.mk
@@ -1,5 +1,5 @@
-FEATURES     = HIGHEND 
 F1_TARGETS  += $(TARGET)
+FEATURES    = HIGHEND 
 
 TARGET_SRC = \
             drivers/accgyro_mpu.c \
@@ -9,4 +9,5 @@ TARGET_SRC = \
             drivers/compass_hmc5883l.c \
             drivers/light_ws2811strip.c \
             drivers/light_ws2811strip_stm32f10x.c \
-            drivers/sonar_hcsr04.c 
\ No newline at end of file
+            drivers/sonar_hcsr04.c
+
diff --git a/src/main/target/PORT103R/target.mk b/src/main/target/PORT103R/target.mk
index 1801357a0..507b303bf 100644
--- a/src/main/target/PORT103R/target.mk
+++ b/src/main/target/PORT103R/target.mk
@@ -1,5 +1,5 @@
-FEATURES     = ONBOARDFLASH HIGHEND 
 F1_TARGETS  += $(TARGET)
+FEATURES     = ONBOARDFLASH HIGHEND 
 
 DEVICE_FLAGS    = -DSTM32F10X_HD
 
@@ -21,3 +21,4 @@ TARGET_SRC = \
             drivers/light_ws2811strip.c \
             drivers/light_ws2811strip_stm32f10x.c \
             drivers/sonar_hcsr04.c
+
diff --git a/src/main/target/REVO/target.mk b/src/main/target/REVO/target.mk
index 148ad8318..21c242fe4 100644
--- a/src/main/target/REVO/target.mk
+++ b/src/main/target/REVO/target.mk
@@ -4,5 +4,5 @@ FEATURES       += VCP ONBOARDFLASH
 TARGET_SRC = \
             drivers/accgyro_spi_mpu6000.c \
             drivers/barometer_ms5611.c \
-            drivers/compass_hmc5883l.c 
+            drivers/compass_hmc5883l.c
 
diff --git a/src/main/target/RMDO/target.mk b/src/main/target/RMDO/target.mk
index c3796b11d..ccbbd5a8e 100644
--- a/src/main/target/RMDO/target.mk
+++ b/src/main/target/RMDO/target.mk
@@ -1,5 +1,5 @@
+F3_TARGETS   += $(TARGET)
 FEATURES     = VCP ONBOARDFLASH
-F3_TARGETS  += $(TARGET)
 TARGET_FLAGS = -DSPRACINGF3
 
 TARGET_SRC = \
@@ -9,5 +9,5 @@ TARGET_SRC = \
             drivers/light_ws2811strip.c \
             drivers/light_ws2811strip_stm32f30x.c \
             drivers/serial_softserial.c \
-            drivers/sonar_hcsr04.c 
+            drivers/sonar_hcsr04.c
 
diff --git a/src/main/target/SINGULARITY/target.mk b/src/main/target/SINGULARITY/target.mk
index 300133e12..5e0b22cbe 100644
--- a/src/main/target/SINGULARITY/target.mk
+++ b/src/main/target/SINGULARITY/target.mk
@@ -1,5 +1,5 @@
-FEATURES     = VCP ONBOARDFLASH
 F3_TARGETS  += $(TARGET)
+FEATURES    = VCP ONBOARDFLASH
 
 TARGET_SRC = \
             drivers/accgyro_mpu.c \
@@ -9,4 +9,3 @@ TARGET_SRC = \
             drivers/serial_softserial.c \
             drivers/vtx_rtc6705.c
 
-
diff --git a/src/main/target/SPARKY/target.mk b/src/main/target/SPARKY/target.mk
index f02f23ce1..76ea72b12 100644
--- a/src/main/target/SPARKY/target.mk
+++ b/src/main/target/SPARKY/target.mk
@@ -1,5 +1,5 @@
-FEATURES     = VCP 
 F3_TARGETS  += $(TARGET)
+FEATURES    = VCP 
 
 TARGET_SRC = \
             drivers/accgyro_mpu.c \
@@ -8,7 +8,5 @@ TARGET_SRC = \
             drivers/barometer_bmp280.c \
             drivers/compass_ak8975.c \
             drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c 
-
-
+            drivers/light_ws2811strip_stm32f30x.c
 
diff --git a/src/main/target/SPRACINGF3/target.mk b/src/main/target/SPRACINGF3/target.mk
index 747e55ea3..00e15bd25 100644
--- a/src/main/target/SPRACINGF3/target.mk
+++ b/src/main/target/SPRACINGF3/target.mk
@@ -1,5 +1,5 @@
-FEATURES     = VCP ONBOARDFLASH
 F3_TARGETS  += $(TARGET)
+FEATURES    = VCP ONBOARDFLASH
 
 TARGET_SRC = \
             drivers/accgyro_mpu.c \
@@ -12,4 +12,5 @@ TARGET_SRC = \
             drivers/light_ws2811strip.c \
             drivers/light_ws2811strip_stm32f30x.c \
             drivers/serial_softserial.c \
-            drivers/sonar_hcsr04.c 
+            drivers/sonar_hcsr04.c
+
diff --git a/src/main/target/SPRACINGF3EVO/target.mk b/src/main/target/SPRACINGF3EVO/target.mk
index ef081538b..9b179afe4 100644
--- a/src/main/target/SPRACINGF3EVO/target.mk
+++ b/src/main/target/SPRACINGF3EVO/target.mk
@@ -1,5 +1,5 @@
-FEATURES     = VCP SDCARD
 F3_TARGETS  += $(TARGET)
+FEATURES    = VCP SDCARD
 
 TARGET_SRC = \
             drivers/accgyro_mpu.c \
@@ -12,5 +12,5 @@ TARGET_SRC = \
             drivers/serial_usb_vcp.c \
             drivers/transponder_ir.c \
             drivers/transponder_ir_stm32f30x.c \
-            io/transponder_ir.c 
+            io/transponder_ir.c
 
diff --git a/src/main/target/SPRACINGF3MINI/target.mk b/src/main/target/SPRACINGF3MINI/target.mk
index 4906d10d4..1c1e3b9a5 100644
--- a/src/main/target/SPRACINGF3MINI/target.mk
+++ b/src/main/target/SPRACINGF3MINI/target.mk
@@ -1,5 +1,5 @@
+F3_TARGETS  += $(TARGET)
 FEATURES    = VCP SDCARD 
-F3_TARGETS += $(TARGET)
 
 TARGET_SRC = \
             drivers/accgyro_mpu.c \
@@ -15,5 +15,5 @@ TARGET_SRC = \
             drivers/sonar_hcsr04.c \
             drivers/transponder_ir.c \
             drivers/transponder_ir_stm32f30x.c \
-            io/transponder_ir.c 
+            io/transponder_ir.c
 
diff --git a/src/main/target/STM32F3DISCOVERY/target.mk b/src/main/target/STM32F3DISCOVERY/target.mk
index 8f0ecfe74..e90db6d09 100644
--- a/src/main/target/STM32F3DISCOVERY/target.mk
+++ b/src/main/target/STM32F3DISCOVERY/target.mk
@@ -1,5 +1,5 @@
+F3_TARGETS  += $(TARGET)
 FEATURES    = VCP SDCARD
-F3_TARGETS += $(TARGET)
 
 TARGET_SRC = \
             drivers/light_ws2811strip.c \
@@ -15,4 +15,5 @@ TARGET_SRC = \
             drivers/accgyro_l3g4200d.c \
             drivers/barometer_ms5611.c \
             drivers/barometer_bmp280.c \
-            drivers/compass_ak8975.c 
+            drivers/compass_ak8975.c
+