Finish refactoring of planet scape