[code review] - changes requested