OZP-407: Perform code review