Refactor / Get rid of spaces