small simplifications
Merge pull request #3 from DanGrayson/master

small simplifications