Small refactorings in incMountain