Clean ups and rewrites.