Some readability fixes.
Merge pull request #45 from randrewj/suggestions

Some readability fixes.