Refactor on cf installer