Remove modification on token value when get tokens
Simplify countDecrease a bit more