Small Lexer refactoring