minor cleanup
Token's funcs are now defaulted: