Removes unused code and duplications (DRY)
Removes unused code and duplications (DRY)
Merge pull request #3 from follesoe/dry

Removes unused code and refactors some code