Style - fix indentation and spacing

No functional change
merging #16
Merge branch 'ghoneycutt-patch-9'