code review changes 2