More whitespace fixing