Refactored tokenisation into a concern.