DOC: refactoring spaces