Improved the way that the Tokenizer.moveNext()-method is being used