OPAL-2327 - code review changes