Refactor cloudflare provider