Refactoring + Encode spaces as +