more code review edits