cosmetic: reindent and remove trailing whitespace