Code Clean up
Merge pull request #4 from otherside94/develop

Code Clean up