A little rewrite