Cleaning up Lexer