Improving cleanup