[OE-4763] code review tweaks