Merge pull request #6 from joprice/housekeeping

Small cleanup