Cleaned up Game class