Refactoring of SpaceWizard