Follow up on code review