clean and fix