More whitespace removal