Minor refactor to fix ABC complexity violation
Minor refactor to fix ABC complexity violation

ausaccessfed/identity-enhancement-service,ausaccessfed/identity-enhancement-service,ausaccessfed/identity-enhancement-service