Lint and bug fix tokeniser