Space refactor