incorporate code review feedback