Cleaned Up, and improved getWeather