Fixup per Stef's review.
Merge pull request #6 from rwjblue/cleanup-comments

Fixup per Stef's review.