More response to code review