Response to code review comments