address code review concerns