fixup! code review fixups