EZP-22781: Fixed review remarks