space refactoring