Refactor mountains