Refactored code
Merge pull request #1 from RedCupCorporation/master

Refactor