More whitespace changes