fix a typo; add formatting
merged formatting
Merge branch 'RichMorin-patch-1'