TASK-2: code review changes