Refactors tokens