PR fixup: simplify code