New tokendefs logic.
Cleanup, formating.
New tokendefs logic.