fixup: more code review changes