code review comments: almost done!