Refactor delimiters in lexer