Standardize format
Merge pull request #1983 from wmtan/StandardizeFormat

Misc cleanups -- Standardize format