Cleaned up WeatherGrid more