Cleanups.
Merge pull request #103 from joelhawksley/jh/cleanups3

Cleanups.