addressed code review