MULE-7207: Improvements per code review