more refactoring of the weather controller.