#102 space objects refactoring