Add WithCertificateKeyFile. Cleanup code a bit.