added ranges and removed redundancies
Merge pull request #71 from mechnesium/patch-3

added ranges and removed redundancies