refactor: spaces