updated with code review changes