tokens type clean up