Refactor weather updating; formatting changes