Performed major refactoring on game and player