got rid of redundancies
Merge pull request #3 from ageoldpun/master

got rid of redundancies