whitespace fixes to several files