Minor improvements

Mostly style changes. Working with ngrossmann to improve this module.
Merge pull request #1 from ghoneycutt/minor_improvements

Minor improvements