Reduce line count, add WaitforCitrix()