OZP-368 - Perform code review