address code review suggestions