Improve cif cleaner.