Merge pull request #23 from rlane/cleanup

Miscellaneous cleanups