Misc indention/style cleanup.
More style cleanup.
Merge branch 'dda-master' into style-cleanup
Merge PR #923 - misc indentation/style cleanup