code style and whitespace cleanups
Merge pull request #658 from hannesm/cleanups

code style and whitespace cleanups -- spring dfmc cleaning