Cleanup + formatting