Small cosmetic tweaks.
Merge pull request #53 from larz0/master

Small cosmetic tweaks.