Cleanups.
Merge pull request #102 from joelhawksley/jh/cleanups2

Cleanups.