refactor/cleanup MatchableInfo by eliminating the Tokens array,