Another round of whitespace fixes