TokenValidationHandler class refactored