Style refactor, replace space instead of whitespace