Cosmetics, no true code changes.

Made a lot of cosmetic changes, removed one annoying log stmt. Nothing
really here.