refactor tokenify