Cleaned up source, fixed duplication bug.
Merge pull request #1 from mrlolethan/master

Cleaned up source, fixed duplication bug.