Finish Lexer
Improve Lexer