Some minor refactorings and cleanups
Merge branch 'master' of github.com:ilikeorangutans/platformer