- clean and fix