diff --git a/flight/pios/stm32f4xx/pios_tim.c b/flight/pios/stm32f4xx/pios_tim.c
index 092aafdbe..dee7c997f 100644
--- a/flight/pios/stm32f4xx/pios_tim.c
+++ b/flight/pios/stm32f4xx/pios_tim.c
@@ -140,7 +140,7 @@ int32_t PIOS_TIM_InitClock(const struct pios_tim_clock_cfg *cfg)
         NVIC_InitTypeDef init = cfg->irq.init;
         init.NVIC_IRQChannel = TIM1_UP_TIM10_IRQn;
         NVIC_Init(&init);
-#if !defined (STM32F401xx) && !defined (STM32F411xE)
+#if !defined(STM32F401xx) && !defined(STM32F411xE)
     } else if (cfg->timer == TIM8) {
         NVIC_InitTypeDef init = cfg->irq.init;
         init.NVIC_IRQChannel = TIM8_UP_TIM13_IRQn;
diff --git a/ground/gcs/src/experimental/USB_UPLOAD_TOOL/main.cpp b/ground/gcs/src/experimental/USB_UPLOAD_TOOL/main.cpp
index 46332256e..793c6787d 100644
--- a/ground/gcs/src/experimental/USB_UPLOAD_TOOL/main.cpp
+++ b/ground/gcs/src/experimental/USB_UPLOAD_TOOL/main.cpp
@@ -15,7 +15,7 @@ int main(int argc, char *argv[])
     bool use_serial   = false;
     bool verify;
     bool debug = false;
-    //bool umodereset   = false;
+    // bool umodereset   = false;
     OP_DFU::Actions action = OP_DFU::actionNone;
     QString file;
     QString serialport;
@@ -27,7 +27,7 @@ int main(int argc, char *argv[])
         debug = true;
     }
     if (args.contains("-ur")) {
-        //umodereset = true;
+        // umodereset = true;
     }
     standardOutput << "OpenPilot serial firmware uploader tool." << endl;
     if (args.indexOf(PROGRAMFW) + 1 < args.length()) {
@@ -57,17 +57,17 @@ int main(int argc, char *argv[])
         }
         action = OP_DFU::actionProgram;
     } else if (args.contains(COMPARECRC) || args.contains(COMPAREALL)) {
-        //int index;
+        // int index;
         if (args.contains(COMPARECRC)) {
-            //index  = args.indexOf(COMPARECRC);
+            // index  = args.indexOf(COMPARECRC);
             action = OP_DFU::actionCompareCrc;
         } else {
-            //index  = args.indexOf(COMPAREALL);
+            // index  = args.indexOf(COMPAREALL);
             action = OP_DFU::actionCompareAll;
         }
     } else if (args.contains(DOWNLOAD)) {
-        //int index;
-        //index  = args.indexOf(DOWNLOAD);
+        // int index;
+        // index  = args.indexOf(DOWNLOAD);
         action = OP_DFU::actionDownload;
     } else if (args.contains(STATUSREQUEST)) {
         action = OP_DFU::actionStatusReq;
diff --git a/ground/gcs/src/experimental/USB_UPLOAD_TOOL/op_dfu.cpp b/ground/gcs/src/experimental/USB_UPLOAD_TOOL/op_dfu.cpp
index 0ccfe1516..f2b6071da 100644
--- a/ground/gcs/src/experimental/USB_UPLOAD_TOOL/op_dfu.cpp
+++ b/ground/gcs/src/experimental/USB_UPLOAD_TOOL/op_dfu.cpp
@@ -1119,11 +1119,11 @@ int DFUObject::receiveData(void *data, int size)
     }
 }
 
-#define BOARD_ID_MB   1
-#define BOARD_ID_INS  2
-#define BOARD_ID_PIP  3
-#define BOARD_ID_CC   4
-#define BOARD_ID_REVO 9
+#define BOARD_ID_MB      1
+#define BOARD_ID_INS     2
+#define BOARD_ID_PIP     3
+#define BOARD_ID_CC      4
+#define BOARD_ID_REVO    9
 #define BOARD_ID_SPARKY2 0x92
 
 /**
diff --git a/ground/gcs/src/plugins/ophid/inc/ophid_const.h b/ground/gcs/src/plugins/ophid/inc/ophid_const.h
index e4699931d..f852ea8d0 100644
--- a/ground/gcs/src/plugins/ophid/inc/ophid_const.h
+++ b/ground/gcs/src/plugins/ophid/inc/ophid_const.h
@@ -31,10 +31,10 @@
 #include <QDebug>
 
 #ifdef OPHID_DEBUG_ON
-#define OPHID_DEBUG(fmt, args ...)   qDebug("[DEBUG] " ## fmt, args)
-#define OPHID_TRACE(fmt, args ...)   qDebug("[TRACE] %s:%s:%d: " ## fmt, __FILE__, __func__, __LINE__, args)
-#define OPHID_ERROR(fmt, args ...)   qDebug("[ERROR] %s:%s:%d: " ## fmt, __FILE__, __func__, __LINE__, args)
-#define OPHID_WARNING(fmt, args ...) qDebug("[WARNING] " ## fmt, args)
+#define OPHID_DEBUG(fmt, args ...)   qDebug("[DEBUG] "##fmt, args)
+#define OPHID_TRACE(fmt, args ...)   qDebug("[TRACE] %s:%s:%d: "##fmt, __FILE__, __func__, __LINE__, args)
+#define OPHID_ERROR(fmt, args ...)   qDebug("[ERROR] %s:%s:%d: "##fmt, __FILE__, __func__, __LINE__, args)
+#define OPHID_WARNING(fmt, args ...) qDebug("[WARNING] "##fmt, args)
 #else
 #define OPHID_DEBUG(fmt, args ...)
 #define OPHID_TRACE(fmt, args ...)
diff --git a/ground/gcs/src/plugins/uavobjectutil/devicedescriptorstruct.h b/ground/gcs/src/plugins/uavobjectutil/devicedescriptorstruct.h
index 2936d28f1..bc118a8df 100644
--- a/ground/gcs/src/plugins/uavobjectutil/devicedescriptorstruct.h
+++ b/ground/gcs/src/plugins/uavobjectutil/devicedescriptorstruct.h
@@ -9,8 +9,8 @@ public:
     QString        gitTag;
     QByteArray     fwHash;
     QByteArray     uavoHash;
-    quint8 boardType;
-    quint8 boardRevision;
+    quint8         boardType;
+    quint8         boardRevision;
     static QString idToBoardName(quint16 id)
     {
         switch (id) {
diff --git a/ground/gcs/src/plugins/uploader/op_dfu.cpp b/ground/gcs/src/plugins/uploader/op_dfu.cpp
index 2d01b666e..ee0cb8a32 100644
--- a/ground/gcs/src/plugins/uploader/op_dfu.cpp
+++ b/ground/gcs/src/plugins/uploader/op_dfu.cpp
@@ -1084,11 +1084,11 @@ int DFUObject::receiveData(void *data, int size)
     }
 }
 
-#define BOARD_ID_MB   1
-#define BOARD_ID_INS  2
-#define BOARD_ID_PIP  3
-#define BOARD_ID_CC   4
-#define BOARD_ID_REVO 9
+#define BOARD_ID_MB      1
+#define BOARD_ID_INS     2
+#define BOARD_ID_PIP     3
+#define BOARD_ID_CC      4
+#define BOARD_ID_REVO    9
 #define BOARD_ID_SPARKY2 0x92
 
 /**
diff --git a/ground/gcs/src/plugins/uploader/runningdevicewidget.cpp b/ground/gcs/src/plugins/uploader/runningdevicewidget.cpp
index dc51b19c2..d1a021e88 100644
--- a/ground/gcs/src/plugins/uploader/runningdevicewidget.cpp
+++ b/ground/gcs/src/plugins/uploader/runningdevicewidget.cpp
@@ -87,8 +87,8 @@ void RunningDeviceWidget::populate()
         devicePic.load(":/uploader/images/gcs-board-cc3d.png");
         break;
     case 0x0903:
-        // Revo
-        // fall through to DF4B
+    // Revo
+    // fall through to DF4B
     case 0x0904:
         // DiscoveryF4Bare
         devicePic.load(":/uploader/images/gcs-board-revo.png");