fixed: token verifier refactoring