TASK-23: Code review changes