Bit of cleanup
Merge branch 'master' of github.com:TheJosh/chaotic-rage