Remove more whitespaces