diff --git a/flight/Modules/CameraStab/camerastab.c b/flight/Modules/CameraStab/camerastab.c
index e8321543b..bff87d892 100644
--- a/flight/Modules/CameraStab/camerastab.c
+++ b/flight/Modules/CameraStab/camerastab.c
@@ -79,7 +79,7 @@ int32_t CameraStabInitialize(void)
 	HwSettingsInitialize();
 	uint8_t optionalModules[HWSETTINGS_OPTIONALMODULES_NUMELEM];
 	HwSettingsOptionalModulesGet(optionalModules);
-    if (optionalModules[HWSETTINGS_OPTIONALMODULES_CAMERASTAB]==HWSETTINGS_OPTIONALMODULES_ENABLED) {
+	if (optionalModules[HWSETTINGS_OPTIONALMODULES_CAMERASTAB] == HWSETTINGS_OPTIONALMODULES_ENABLED) {
 		camerastabEnabled=1;
 	} else {
 		camerastabEnabled=0;
diff --git a/flight/Modules/GPS/GPS.c b/flight/Modules/GPS/GPS.c
index 3d844d5fc..deef4fcbe 100644
--- a/flight/Modules/GPS/GPS.c
+++ b/flight/Modules/GPS/GPS.c
@@ -78,7 +78,7 @@ static float GravityAccel(float latitude, float longitude, float altitude);
 // Private variables
 
 static uint32_t gpsPort;
-static uint8_t gpsEnabled = 0;
+static bool gpsEnabled = false;
 
 static xTaskHandle gpsTaskHandle;
 
@@ -123,10 +123,10 @@ int32_t GPSInitialize(void)
 	HwSettingsInitialize();
 	uint8_t optionalModules[HWSETTINGS_OPTIONALMODULES_NUMELEM];
 	HwSettingsOptionalModulesGet(optionalModules);
-    if (optionalModules[HWSETTINGS_OPTIONALMODULES_GPS]==HWSETTINGS_OPTIONALMODULES_ENABLED) {
-		gpsEnabled=1;
+	if (optionalModules[HWSETTINGS_OPTIONALMODULES_GPS] == HWSETTINGS_OPTIONALMODULES_ENABLED) {
+		gpsEnabled = true;
 	} else {
-		gpsEnabled=0;
+		gpsEnabled = false;
 	}
 
 	if (gpsPort && gpsEnabled) {
diff --git a/flight/Modules/System/systemmod.c b/flight/Modules/System/systemmod.c
index 6740e88aa..b3da26870 100644
--- a/flight/Modules/System/systemmod.c
+++ b/flight/Modules/System/systemmod.c
@@ -46,7 +46,6 @@
 #include "systemsettings.h"
 #include "i2cstats.h"
 #include "taskinfo.h"
-#include "hwsettings.h"
 #include "watchdogstatus.h"
 #include "taskmonitor.h"