replace Tokens::compare with Token->equals

More handy to use it :)
There should be a separation between the short and long descriptions.