-clean and fix