minor cleanups (indentation, formatting and ordering)

Well, sure, a whitespace change can slip through the cracks once in a while. That shouldn't be an encouragement to do even more.