A little cleanup
Merge pull request #146 from robtarr/master

A little cleanup