refactoring: move space'