simplify implimentation of token clause