Cleaned up redundent code
Merge pull request #4 from angelxmoreno/develop

Cleaned up redundent code