some code review revision