code review changes round 1