Cleaning up some code
Merge pull request #1 from Dezzles/develop

Cleaning up some code