removed use of regular expressions from the lexer