OZP-64: code review changes: comment fixes
OZP-64: Preferences Service changes