Refactoring return of CheckToken