Follow up after code review