minor formatting changes.
Merge branch 'cleanup-20140616' into develop