OZP-804 - Code review changes.