code review changes #1