Cleanups and checks
Fix
Rename TokenId