Fixing some stylistic issues.

Partially addresses issue #9.
Merge pull request #10 from rolsen/style_fixes

Fixing some stylistic issues.