Small rewrite