Cleanup and tweaks without breaking anything