cleaned up some game logic