whitespace and other minor style fixes