clean up code
Merge branch 'dev_collisions' of https://github.com/atryputsen/game-evolution into dev_collisions