another code review changes