Small refactors
Cleanup stuff
Merge pull request #1 from WorstBehaviour/develop

Code Cleanup