Clean Up editing