Refactoring Application Token