Refactoring of SimpleWeather