Tiny cosmetic changes.
Merge pull request #7 from mdorman/merge

Tiny cosmetic changes.