Balance game and clean up code