integrate code review feedback, except tests