Typo and Format Fixes
Merge pull request #965