minor cleanups (indentation, formatting and ordering)

Please, no whitespace changes...