use better variable names in lexer