code review changes 0.9

first revision of code review changes