Clean rewrite done.