TASK-21: Changes from code review