TASK-40: Code review changes