changed visibility of tokentype and added some comments