diff --git a/ground/openpilotgcs/src/plugins/config/calibration/sixpointcalibrationmodel.cpp b/ground/openpilotgcs/src/plugins/config/calibration/sixpointcalibrationmodel.cpp
index f877a44b5..0593600e0 100644
--- a/ground/openpilotgcs/src/plugins/config/calibration/sixpointcalibrationmodel.cpp
+++ b/ground/openpilotgcs/src/plugins/config/calibration/sixpointcalibrationmodel.cpp
@@ -101,7 +101,7 @@ SixPointCalibrationModel::SixPointCalibrationModel(QObject *parent) :
     revoCalibration   = RevoCalibration::GetInstance(getObjectManager());
     Q_ASSERT(revoCalibration);
 
-    auxMagSettings = AuxMagSettings::GetInstance(getObjectManager());
+    auxMagSettings    = AuxMagSettings::GetInstance(getObjectManager());
     Q_ASSERT(auxMagSettings);
 
     accelGyroSettings = AccelGyroSettings::GetInstance(getObjectManager());
@@ -440,7 +440,7 @@ void SixPointCalibrationModel::compute()
     double Be_length;
 
     RevoCalibration::DataFields revoCalibrationData     = revoCalibration->getData();
-    AuxMagSettings::DataFields auxCalibrationData    = auxMagSettings->getData();
+    AuxMagSettings::DataFields auxCalibrationData       = auxMagSettings->getData();
     AccelGyroSettings::DataFields accelGyroSettingsData = accelGyroSettings->getData();
 
     HomeLocation::DataFields homeLocationData = homeLocation->getData();
@@ -521,8 +521,8 @@ void SixPointCalibrationModel::compute()
     if (good_calibration) {
         m_dirty = true;
         if (calibratingMag) {
-            result.revoCalibrationData   = revoCalibrationData;
-            result.auxMagSettingsData = auxCalibrationData;
+            result.revoCalibrationData = revoCalibrationData;
+            result.auxMagSettingsData  = auxCalibrationData;
             displayInstructions(tr("Magnetometer calibration completed successfully."), WizardModel::Success);
         }
         if (calibratingAccel) {
diff --git a/ground/openpilotgcs/src/plugins/config/calibration/sixpointcalibrationmodel.h b/ground/openpilotgcs/src/plugins/config/calibration/sixpointcalibrationmodel.h
index b398aeb0c..464a20de9 100644
--- a/ground/openpilotgcs/src/plugins/config/calibration/sixpointcalibrationmodel.h
+++ b/ground/openpilotgcs/src/plugins/config/calibration/sixpointcalibrationmodel.h
@@ -92,14 +92,14 @@ public:
         UAVObject::Metadata accelStateMetadata;
         UAVObject::Metadata magSensorMetadata;
         UAVObject::Metadata auxMagSensorMetadata;
-        AuxMagSettings::DataFields auxMagSettings;
+        AuxMagSettings::DataFields    auxMagSettings;
         RevoCalibration::DataFields   revoCalibrationData;
         AccelGyroSettings::DataFields accelGyroSettingsData;
     } Memento;
 
     typedef struct {
         RevoCalibration::DataFields   revoCalibrationData;
-        AuxMagSettings::DataFields auxMagSettingsData;
+        AuxMagSettings::DataFields    auxMagSettingsData;
         AccelGyroSettings::DataFields accelGyroSettingsData;
     } Result;