Cosmetics: reindent and unify whitespace