small MechanizedAuthorization refactoring
fixed MechanizedAuthorization