Another bunch of rewrites and refinements
Another bunch of rewriting stuff