After first code review