Various cleanups
Merge pull request #270 from ianvollick/cleanups

LGTM