Final clean-up, no code changes, just some minor reformatting.