code style and whitespace cleanups -- spring dfmc cleaning