Lexer cleanup