[fixup] PR feedback