Refactoring atmosphere classes