Refactoring TokenEndPoint