more refactoring on game class