TASK-35: Code review changes