MULE-7152: Make adjustments after code review