Refactoring; Space fix.