removed unnecessary code
removed unnecessary dependency
lexer improvement