minor cleanups (indentation, formatting and ordering)