General whitespace fixes