integrate code review comments