Refactor space