More whitespace cleanup