simplifying CF management, keeping it internal