Modify structure to allow use of the method "isNextToken".

- Simplify a little bit the code