Misc indention/style cleanup.