Refactor into weather model