diff --git a/flight/targets/boards/sparky2/pios_board.h b/flight/targets/boards/sparky2/pios_board.h
index cb28e471b..92454499b 100644
--- a/flight/targets/boards/sparky2/pios_board.h
+++ b/flight/targets/boards/sparky2/pios_board.h
@@ -76,7 +76,7 @@
 // ------------------------
 #define PIOS_LED_HEARTBEAT 0
 #define PIOS_LED_ALARM     1
-#define PIOS_LED_LINK         2
+#define PIOS_LED_LINK      2
 
 #ifdef PIOS_RFM22B_DEBUG_ON_TELEM
 #define PIOS_LED_D1        2
diff --git a/ground/gcs/src/plugins/config/configsparky2hwwidget.cpp b/ground/gcs/src/plugins/config/configsparky2hwwidget.cpp
index 84376aba2..b1da9465a 100644
--- a/ground/gcs/src/plugins/config/configsparky2hwwidget.cpp
+++ b/ground/gcs/src/plugins/config/configsparky2hwwidget.cpp
@@ -67,8 +67,8 @@ ConfigSparky2HWWidget::ConfigSparky2HWWidget(QWidget *parent) : ConfigTaskWidget
     addWidgetBinding("HwSettings", "GPSSpeed", m_ui->cbMainGPSSpeed);
     addWidgetBinding("HwSettings", "ComUsbBridgeSpeed", m_ui->cbMainComSpeed);
 
-    //addWidgetBinding("HwSettings", "TelemetrySpeed", m_ui->cbRcvrTelemSpeed);
-    //addWidgetBinding("HwSettings", "ComUsbBridgeSpeed", m_ui->cbRcvrComSpeed);
+    // addWidgetBinding("HwSettings", "TelemetrySpeed", m_ui->cbRcvrTelemSpeed);
+    // addWidgetBinding("HwSettings", "ComUsbBridgeSpeed", m_ui->cbRcvrComSpeed);
 
     // Add Gps protocol configuration
     addWidgetBinding("GPSSettings", "DataProtocol", m_ui->cbMainGPSProtocol);
@@ -94,13 +94,13 @@ void ConfigSparky2HWWidget::setupCustomCombos()
     connect(m_ui->cbUSBHIDFunction, SIGNAL(currentIndexChanged(int)), this, SLOT(usbHIDPortChanged(int)));
     connect(m_ui->cbUSBVCPFunction, SIGNAL(currentIndexChanged(int)), this, SLOT(usbVCPPortChanged(int)));
 
-    //m_ui->cbSonar->addItem(tr("Disabled"));
-    //m_ui->cbSonar->setCurrentIndex(0);
-    //m_ui->cbSonar->setEnabled(false);
+    // m_ui->cbSonar->addItem(tr("Disabled"));
+    // m_ui->cbSonar->setCurrentIndex(0);
+    // m_ui->cbSonar->setEnabled(false);
 
     connect(m_ui->cbFlexi, SIGNAL(currentIndexChanged(int)), this, SLOT(flexiPortChanged(int)));
     connect(m_ui->cbMain, SIGNAL(currentIndexChanged(int)), this, SLOT(mainPortChanged(int)));
-    //connect(m_ui->cbRcvr, SIGNAL(currentIndexChanged(int)), this, SLOT(rcvrPortChanged(int)));
+    // connect(m_ui->cbRcvr, SIGNAL(currentIndexChanged(int)), this, SLOT(rcvrPortChanged(int)));
 }
 
 void ConfigSparky2HWWidget::refreshWidgetsValues(UAVObject *obj)
@@ -111,7 +111,7 @@ void ConfigSparky2HWWidget::refreshWidgetsValues(UAVObject *obj)
     usbVCPPortChanged(0);
     mainPortChanged(0);
     flexiPortChanged(0);
-    //rcvrPortChanged(0);
+    // rcvrPortChanged(0);
     m_refreshing = false;
 }
 
diff --git a/ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp b/ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
index f01ff95e9..a6daf13f6 100644
--- a/ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
+++ b/ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
@@ -577,7 +577,7 @@ void VehicleConfigurationHelper::applyActuatorConfiguration()
                     data.BankUpdateFreq[i] = escFrequence;
                 }
             } else if (m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_REVO
-                || m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_SPARKY2) {
+                       || m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_SPARKY2) {
                 // Motor output4, bank3
                 if (i == 2) {
                     data.BankUpdateFreq[i] = escFrequence;
@@ -623,7 +623,7 @@ void VehicleConfigurationHelper::applyActuatorConfiguration()
                     data.BankUpdateFreq[i] = escFrequence;
                 }
             } else if (m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_REVO
-                || m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_SPARKY2) {
+                       || m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_SPARKY2) {
                 // Motor output4, bank3
                 if (i == 1) {
                     data.BankUpdateFreq[i] = escFrequence;
@@ -1370,7 +1370,7 @@ void VehicleConfigurationHelper::setupHexaCopter()
         channels[0].throttle2 = 0;
         channels[0].roll      = 100;
         channels[0].pitch     = 25;
-        channels[0].yaw = -66;
+        channels[0].yaw       = -66;
 
 
         channels[1].type      = MIXER_TYPE_MOTOR;
@@ -1378,35 +1378,35 @@ void VehicleConfigurationHelper::setupHexaCopter()
         channels[1].throttle2 = 0;
         channels[1].roll      = 100;
         channels[1].pitch     = 25;
-        channels[1].yaw = 66;
+        channels[1].yaw       = 66;
 
         channels[2].type      = MIXER_TYPE_MOTOR;
         channels[2].throttle1 = 100;
         channels[2].throttle2 = 0;
         channels[2].roll      = -100;
         channels[2].pitch     = 25;
-        channels[2].yaw = -66;
+        channels[2].yaw       = -66;
 
         channels[3].type      = MIXER_TYPE_MOTOR;
         channels[3].throttle1 = 100;
         channels[3].throttle2 = 0;
         channels[3].roll      = -100;
         channels[3].pitch     = 25;
-        channels[3].yaw = 66;
+        channels[3].yaw       = 66;
 
         channels[4].type      = MIXER_TYPE_MOTOR;
         channels[4].throttle1 = 100;
         channels[4].throttle2 = 0;
         channels[4].roll      = 0;
         channels[4].pitch     = -50;
-        channels[4].yaw = -66;
+        channels[4].yaw       = -66;
 
         channels[5].type      = MIXER_TYPE_MOTOR;
         channels[5].throttle1 = 100;
         channels[5].throttle2 = 0;
         channels[5].roll      = 0;
         channels[5].pitch     = -50;
-        channels[5].yaw = 66;
+        channels[5].yaw       = 66;
 
         guiSettings.multi.VTOLMotorNW = 1;
         guiSettings.multi.VTOLMotorW  = 2;