Code cleanup, typo fixes.
Merge pull request #1 from biot/fixes

Code cleanup, typo fixes.