Merge pull request #22 from mbolivar/misc-cleanups

Misc cleanups