addressed code review issues