refactoring token calls to <\&token> instead of <.token>