cleaned up tstr
renamed tstr to tokstr