Integrate code review comments.