Refactor WeatherService