Refactor weather