TASK-40: code review changes