fixup! more tidying up