Refactored token retrival.