fixup! add more context per code review