Fixade reader i Lexer
Refactor Lexer