Cleaned up some code
Merge branch 'master' of https://github.com/KevinEdelmann/HideOut.git
finalize clean up