Fix mixed and trailing whitespace