diff --git a/source/Core/Inc/Settings.h b/source/Core/Inc/Settings.h
index e9c1bd55..9fa7da71 100644
--- a/source/Core/Inc/Settings.h
+++ b/source/Core/Inc/Settings.h
@@ -78,6 +78,14 @@ typedef enum {
   FAST      = 3, //
   MAX_VALUE = 4  //
 } settingOffSpeed_t;
+
+typedef enum {
+  NO     = 0, // Disabled
+  SOLDER = 1, // Gain default soldering temp (Soldering Mode)
+  SLEEP  = 2, // Gain default sleeping temp (Idle/Standby Mode)
+  ZERO   = 3, // Power on only (No heat Mode)
+} autoStartMode_t;
+
 // Settings wide operations
 void saveSettings();
 bool loadSettings();
diff --git a/source/Core/Src/settingsGUI.cpp b/source/Core/Src/settingsGUI.cpp
index ef95b6ae..c65596c4 100644
--- a/source/Core/Src/settingsGUI.cpp
+++ b/source/Core/Src/settingsGUI.cpp
@@ -496,16 +496,16 @@ static void displayBoostTemp(void) {
 static void displayAutomaticStartMode(void) {
 
   switch (getSettingValue(SettingsOptions::AutoStartMode)) {
-  case 0:
+  case autoStartMode_t::NO:
     OLED::print(translatedString(Tr->SettingStartNoneChar), FontStyle::LARGE);
     break;
-  case 1:
+  case autoStartMode_t::SOLDER:
     OLED::print(translatedString(Tr->SettingStartSolderingChar), FontStyle::LARGE);
     break;
-  case 2:
+  case autoStartMode_t::SLEEP:
     OLED::print(translatedString(Tr->SettingStartSleepChar), FontStyle::LARGE);
     break;
-  case 3:
+  case autoStartMode_t::ZERO:
     OLED::print(translatedString(Tr->SettingStartSleepOffChar), FontStyle::LARGE);
     break;
   default:
diff --git a/source/Core/Threads/OperatingModes/Sleep.cpp b/source/Core/Threads/OperatingModes/Sleep.cpp
index f94891b7..ef6c78d8 100644
--- a/source/Core/Threads/OperatingModes/Sleep.cpp
+++ b/source/Core/Threads/OperatingModes/Sleep.cpp
@@ -21,12 +21,7 @@ int gui_SolderingSleepingMode(bool stayOff, bool autoStarted) {
       currentTempTargetDegC = stayOff ? 0 : min(getSettingValue(SettingsOptions::SleepTemp), getSettingValue(SettingsOptions::SolderingTemp));
     }
     // draw the lcd
-    uint16_t tipTemp;
-    if (getSettingValue(SettingsOptions::TemperatureInF))
-      tipTemp = TipThermoModel::getTipInF();
-    else {
-      tipTemp = TipThermoModel::getTipInC();
-    }
+    uint16_t tipTemp = getSettingValue(SettingsOptions::TemperatureInF) ? TipThermoModel::getTipInF() : TipThermoModel::getTipInC();
 
     OLED::clearScreen();
     OLED::setCursor(0, 0);