OZP-368 - Perform code review
changes from code review