Some improvements for the GameController class