Changed tokentype string value from Undefined to none