Some clean up in NumberGameScreen