Cleanup improvements