Working on lexer token splitting