CodeCleanup
Merge pull request #1 from jonnymalingo/develop

Code Cleanup