misc cleanups
Merge pull request #66 from google/devoncarew_cleanup

misc cleanups