address code review feedback