EZP-22210: Fixed review remarks