cleanup, refactoring, data driven game logic