code review changes 1.0

final revision