Fixed typo.
Minor style tweaks.
Merge pull request #1432 from cmfcmf/typos-and-fixes

Typos and style tweaks