Cleanup and rewrites
Cleanup