Refactoring of Mountains and spec.