whitespace fixes

indentation
trailing space
a few extraneous newlines