updated token files

was using this syntax where it was not appropriate

token still needs a lot of work. I need a 'style'