refractoring of Lexer structure