diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/WeatherHandler.java b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/WeatherHandler.java
index 98ed755..119518a 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/WeatherHandler.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/WeatherHandler.java
@@ -45,8 +45,8 @@
     private HistoricalWeather histWeather;
     private DayForecast todaysForecast;
     private DayForecast tomorrowsForecast;
-    private static float minHotTemp;
-    private static float maxColdTemp;
+    private static float MIN_HOT_TEMP = 30;
+    private static float MAX_COLD_TEMP = 10;
     private static float minWindySpeed;
 
     private static Activity activity;
@@ -108,11 +108,8 @@
 
         minWindySpeed = 8; //http://www.wettergefahren-fruehwarnung.de/Artikel/beaufort.html
         if(weatherConfig.unitSystem.equals(WeatherConfig.UNIT_SYSTEM.I)){
-            minHotTemp = celsiusToFahrenheit(30);
-            maxColdTemp = celsiusToFahrenheit(10);
-        } else {
-            minHotTemp = 30;
-            maxColdTemp = 10;
+            MIN_HOT_TEMP = celsiusToFahrenheit(MIN_HOT_TEMP);
+            MAX_COLD_TEMP = celsiusToFahrenheit(MAX_COLD_TEMP);
         }
 
         weatherClient = null;
@@ -316,7 +313,7 @@
 
     private boolean isHot(){
         return todaysWeather.currentCondition.getWeatherCode().getCode() == WeatherCode.SUNNY.getCode() ||
-                (todaysWeather.temperature.getTemp() >= minHotTemp || todaysWeather.temperature.getMaxTemp() >= minHotTemp);
+                (todaysWeather.temperature.getTemp() >= MIN_HOT_TEMP || todaysWeather.temperature.getMaxTemp() >= MIN_HOT_TEMP);
     }
 
     private boolean isSunny(){
@@ -325,7 +322,7 @@
 
     private boolean isCold(){
         return todaysWeather.currentCondition.getWeatherCode().getCode() == WeatherCode.COLD.getCode() ||
-                (todaysWeather.temperature.getTemp() <= maxColdTemp || todaysWeather.temperature.getMinTemp() <= maxColdTemp);
+                (todaysWeather.temperature.getTemp() <= MAX_COLD_TEMP || todaysWeather.temperature.getMinTemp() <= MAX_COLD_TEMP);
     }
 
     private boolean isWindy(){