Small rewrite on block factory