DEV-35 code review changes