Enhance GOTO sentence