Further cleaned up weathergrid