diff --git a/flight/modules/StateEstimation/filtercf.c b/flight/modules/StateEstimation/filtercf.c
index c6d7be416..992eef8ef 100644
--- a/flight/modules/StateEstimation/filtercf.c
+++ b/flight/modules/StateEstimation/filtercf.c
@@ -45,9 +45,9 @@
 
 // Private constants
 
-#define STACK_REQUIRED 512
+#define STACK_REQUIRED          512
 
-#define CALIBRATION_DELAY_MS 4000
+#define CALIBRATION_DELAY_MS    4000
 #define CALIBRATION_DURATION_MS 6000
 
 // Private types
diff --git a/ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.h b/ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.h
index dc9870d42..be1ec45a1 100644
--- a/ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.h
+++ b/ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.h
@@ -44,7 +44,6 @@
 #include <QTimer>
 
 namespace Core {
-
 class IConnection;
 
 namespace Internal {
diff --git a/ground/openpilotgcs/src/plugins/coreplugin/workspacesettings.cpp b/ground/openpilotgcs/src/plugins/coreplugin/workspacesettings.cpp
index 345d53039..6ffaa4a0b 100644
--- a/ground/openpilotgcs/src/plugins/coreplugin/workspacesettings.cpp
+++ b/ground/openpilotgcs/src/plugins/coreplugin/workspacesettings.cpp
@@ -39,13 +39,11 @@ using namespace Core::Internal;
 const int WorkspaceSettings::MAX_WORKSPACES = 10;
 
 WorkspaceSettings::WorkspaceSettings(QObject *parent) :
-        IOptionsPage(parent)
-{
-}
+    IOptionsPage(parent)
+{}
 
 WorkspaceSettings::~WorkspaceSettings()
-{
-}
+{}
 
 // IOptionsPage