MULE-7521: Improvement per code review