whitespace fixes, mostly