Refactor lexer operators