addressed code review notes