refactoring ZenTokenContext
refactoring ZenTokenContext