1. Shorten names of tokens.
2. Change some method, make them more readable.