Rewrite and reorganize.