Refactoring to JFlex continue