Fixes small typo and cleans a couple of comments.
Merge pull request #766 from towanda/small-typo

Fixes small typo and cleans a couple of comments.