Incorporating code review comments.