Refactored as discussed - OrchestrationUtil