fixed misc duplications
Merge pull request #19 from BrandonMcNary/master

fixed misc duplications