[OOM-K8S-CERT-EXTERNAL-PROVIDER] Refactoring & code improvements