addressed code review changes