resolve code review issues