Refactored OpenWeatherMap