cleaned up game class