reduce duplicate checks
Merge pull request #12 from borkweb/reduce-duplicate-checks

reduce duplicate checks