Slight climate refactoring