Code cleanup: misterious Int32 tokenId