Refactor on cf_installer