integrate code review feedback