Refactored Token/Tkn code.