Cleanups.
Merge pull request #104 from joelhawksley/jh/cleanups4

Cleanups.