Fix whitespace removal