simplify delimiter matching