Cf refactor for clarity