Minor format changes
Merge branch 'minor-format-changes'