PORTAL-283
- code review issues addressed