addressed comments in code review