weather refactorings