getTokenSet & createToken methods are now more readable