diff --git a/src/KubernetesClientConfiguration.ConfigFile.cs b/src/KubernetesClientConfiguration.ConfigFile.cs
index 1dc5b07..8024764 100644
--- a/src/KubernetesClientConfiguration.ConfigFile.cs
+++ b/src/KubernetesClientConfiguration.ConfigFile.cs
@@ -24,17 +24,6 @@ namespace k8s
                 ? Path.Combine(Environment.GetEnvironmentVariable("USERPROFILE"), @".kube\config")
                 : Path.Combine(Environment.GetEnvironmentVariable("HOME"), ".kube/config");
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="KubernetesClientConfiguration"/> class.
-        /// </summary>
-        /// <param name="kubeconfig">kubeconfig file info</param>
-        /// <param name="currentContext">Context to use from kube config</param>
-        public KubernetesClientConfiguration(FileInfo kubeconfig = null, string currentContext = null)
-        {
-            var k8SConfig = LoadKubeConfig(kubeconfig ?? new FileInfo(KubeConfigDefaultLocation));
-            this.Initialize(k8SConfig, currentContext);
-        }
-
         /// <summary>
         /// Initializes a new instance of the <see cref="KubernetesClientConfiguration"/> from config file
         /// </summary>
@@ -60,7 +49,7 @@ namespace k8s
 
             var k8SConfig = LoadKubeConfig(kubeconfig);
             var k8SConfiguration = new KubernetesClientConfiguration();
-            k8SConfiguration.Initialize(k8SConfig);
+            k8SConfiguration.Initialize(k8SConfig, currentContext);
 
             if (!string.IsNullOrWhiteSpace(masterUrl))
             {
@@ -200,7 +189,7 @@ namespace k8s
         /// <summary>
         /// Loads Kube Config
         /// </summary>
-        /// <param name="config">Kube config file contents</param>
+        /// <param name="kubeconfig">Kube config file contents</param>
         /// <returns>Instance of the <see cref="K8SConfiguration"/> class</returns>
         private static K8SConfiguration LoadKubeConfig(FileInfo kubeconfig)
         {
diff --git a/src/KubernetesClientConfiguration.cs b/src/KubernetesClientConfiguration.cs
index de0aaa3..b053d51 100644
--- a/src/KubernetesClientConfiguration.cs
+++ b/src/KubernetesClientConfiguration.cs
@@ -1,78 +1,67 @@
+using System.Security.Cryptography.X509Certificates;
+
 namespace k8s
 {
-    using System;
-    using System.IO;
-    using System.Linq;
-    using System.Security.Cryptography.X509Certificates;
-    using k8s.Exceptions;
-    using k8s.KubeConfigModels;
-    using YamlDotNet.Serialization;
-    using System.Runtime.InteropServices;
-
     /// <summary>
-    /// Represents a set of kubernetes client configuration settings
+    ///     Represents a set of kubernetes client configuration settings
     /// </summary>
     public partial class KubernetesClientConfiguration
     {
-        public KubernetesClientConfiguration()
-        {
-        }
-
         /// <summary>
-        /// Gets Host
+        ///     Gets Host
         /// </summary>
         public string Host { get; set; }
 
         /// <summary>
-        /// Gets SslCaCert
+        ///     Gets SslCaCert
         /// </summary>
         public X509Certificate2 SslCaCert { get; set; }
 
         /// <summary>
-        /// Gets ClientCertificateData
+        ///     Gets ClientCertificateData
         /// </summary>
         public string ClientCertificateData { get; set; }
 
         /// <summary>
-        /// Gets ClientCertificate Key
+        ///     Gets ClientCertificate Key
         /// </summary>
         public string ClientCertificateKeyData { get; set; }
 
         /// <summary>
-        /// Gets ClientCertificate filename
+        ///     Gets ClientCertificate filename
         /// </summary>
         public string ClientCertificateFilePath { get; set; }
 
         /// <summary>
-        /// Gets ClientCertificate Key filename
+        ///     Gets ClientCertificate Key filename
         /// </summary>
         public string ClientKeyFilePath { get; set; }
 
         /// <summary>
-        /// Gets a value indicating whether to skip ssl server cert validation
+        ///     Gets a value indicating whether to skip ssl server cert validation
         /// </summary>
         public bool SkipTlsVerify { get; set; }
 
         /// <summary>
-        /// Gets or sets the HTTP user agent.
+        ///     Gets or sets the HTTP user agent.
         /// </summary>
         /// <value>Http user agent.</value>
         public string UserAgent { get; set; }
 
         /// <summary>
-        /// Gets or sets the username (HTTP basic authentication).
+        ///     Gets or sets the username (HTTP basic authentication).
         /// </summary>
         /// <value>The username.</value>
         public string Username { get; set; }
 
         /// <summary>
-        /// Gets or sets the password (HTTP basic authentication).
+        ///     Gets or sets the password (HTTP basic authentication).
         /// </summary>
         /// <value>The password.</value>
         public string Password { get; set; }
 
         /// <summary>
-        /// Gets or sets the access token for OAuth2 authentication.
+        ///     Gets or sets the access token for OAuth2 authentication.
         /// </summary>
         /// <value>The access token.</value>
         public string AccessToken { get; set; }
diff --git a/tests/CertUtilsTests.cs b/tests/CertUtilsTests.cs
index 3b3b83e..ce290a7 100644
--- a/tests/CertUtilsTests.cs
+++ b/tests/CertUtilsTests.cs
@@ -19,7 +19,7 @@ namespace k8s.Tests
         public void LoadFromFiles() 
         {
             var fi = new FileInfo(kubeConfigFileName);
-            var cfg = new KubernetesClientConfiguration(fi, "federal-context");
+            var cfg = KubernetesClientConfiguration.BuildConfigFromConfigFile(fi, "federal-context");
 
             // Just validate that this doesn't throw and private key is non-null
             var cert = CertUtils.GeneratePfx(cfg);
@@ -33,7 +33,7 @@ namespace k8s.Tests
         public void LoadFromInlineData() 
         {
             var fi = new FileInfo(kubeConfigFileName);
-            var cfg = new KubernetesClientConfiguration(fi, "victorian-context");
+            var cfg = KubernetesClientConfiguration.BuildConfigFromConfigFile(fi, "victorian-context");
 
             // Just validate that this doesn't throw and private key is non-null
             var cert = CertUtils.GeneratePfx(cfg);
diff --git a/tests/KubernetesClientConfigurationTests.cs b/tests/KubernetesClientConfigurationTests.cs
index d21b847..68b7832 100755
--- a/tests/KubernetesClientConfigurationTests.cs
+++ b/tests/KubernetesClientConfigurationTests.cs
@@ -64,7 +64,7 @@ namespace k8s.Tests
         public void ConfigurationFileNotFound()
         {
             var fi = new FileInfo("/path/to/nowhere");
-            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => new KubernetesClientConfiguration(fi));
+            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => KubernetesClientConfiguration.BuildConfigFromConfigFile(fi));
         }
 
         /// <summary>
@@ -73,7 +73,7 @@ namespace k8s.Tests
         [Fact]
         public void DefaultConfigurationLoaded()
         {
-            var cfg = new KubernetesClientConfiguration(new FileInfo(kubeConfigFileName));
+            var cfg = KubernetesClientConfiguration.BuildConfigFromConfigFile(new FileInfo(kubeConfigFileName));
             Assert.NotNull(cfg.Host);
         }
 
@@ -86,7 +86,7 @@ namespace k8s.Tests
         public void ContextHost(string context, string host)
         {
             var fi = new FileInfo(kubeConfigFileName);
-            var cfg = new KubernetesClientConfiguration(fi, context);
+            var cfg = KubernetesClientConfiguration.BuildConfigFromConfigFile(fi, context);
             Assert.Equal(host, cfg.Host);
         }
 
@@ -100,7 +100,7 @@ namespace k8s.Tests
         public void ContextUserToken(string context, string token)
         {
             var fi = new FileInfo(kubeConfigFileName);
-            var cfg = new KubernetesClientConfiguration(fi, context);
+            var cfg = KubernetesClientConfiguration.BuildConfigFromConfigFile(fi, context);
             Assert.Equal(context, cfg.CurrentContext);
             Assert.Null(cfg.Username);
             Assert.Equal(token, cfg.AccessToken);
@@ -117,7 +117,7 @@ namespace k8s.Tests
         public void ContextCertificateTest(string context, string clientCert, string clientCertKey)
         {
             var fi = new FileInfo(kubeConfigFileName);
-            var cfg = new KubernetesClientConfiguration(fi, context);
+            var cfg = KubernetesClientConfiguration.BuildConfigFromConfigFile(fi, context);
             Assert.Equal(context, cfg.CurrentContext);
             Assert.Equal(cfg.ClientCertificateFilePath, clientCert);
             Assert.Equal(cfg.ClientKeyFilePath, clientCertKey);
@@ -132,7 +132,7 @@ namespace k8s.Tests
         public void ClientDataTest(string context)
         {
             var fi = new FileInfo(kubeConfigFileName);
-            var cfg = new KubernetesClientConfiguration(fi, context);
+            var cfg = KubernetesClientConfiguration.BuildConfigFromConfigFile(fi, context);
             Assert.Equal(context, cfg.CurrentContext);
             Assert.NotNull(cfg.SslCaCert);
             Assert.Equal(readLine("assets/client-certificate-data.txt"), cfg.ClientCertificateData);
@@ -147,7 +147,7 @@ namespace k8s.Tests
         public void ContextNotFound()
         {
             var fi = new FileInfo(kubeConfigFileName);
-            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => new KubernetesClientConfiguration(fi, "context-not-found"));
+            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => KubernetesClientConfiguration.BuildConfigFromConfigFile(fi, "context-not-found"));
         }
 
         /// <summary>
@@ -157,7 +157,7 @@ namespace k8s.Tests
         public void NoContexts()
         {
             var fi = new FileInfo(kubeConfigNoContexts);
-            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => new KubernetesClientConfiguration(fi));
+            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => KubernetesClientConfiguration.BuildConfigFromConfigFile(fi));
         }
 
         /// <summary>
@@ -167,7 +167,7 @@ namespace k8s.Tests
         public void NoContextsExplicit()
         {
             var fi = new FileInfo(kubeConfigNoContexts);
-            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => new KubernetesClientConfiguration(fi, "context"));
+            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => KubernetesClientConfiguration.BuildConfigFromConfigFile(fi, "context"));
         }
 
         /// <summary>
@@ -177,7 +177,7 @@ namespace k8s.Tests
         public void UserPasswordAuthentication()
         {
             var fi = new FileInfo(kubeConfigUserPassword);
-            var cfg = new KubernetesClientConfiguration(fi);
+            var cfg = KubernetesClientConfiguration.BuildConfigFromConfigFile(fi);
             Assert.Equal("admin", cfg.Username);
             Assert.Equal("secret", cfg.Password);
         }
@@ -189,7 +189,7 @@ namespace k8s.Tests
         public void IncompleteUserCredentials()
         {
             var fi = new FileInfo(kubeConfigNoCredentials);
-            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => new KubernetesClientConfiguration(fi));
+            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => KubernetesClientConfiguration.BuildConfigFromConfigFile(fi));
         }
 
         /// <summary>
@@ -199,7 +199,7 @@ namespace k8s.Tests
         public void ServerNotFound()
         {
             var fi = new FileInfo(kubeConfigNoServer);
-            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => new KubernetesClientConfiguration(fi));
+            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => KubernetesClientConfiguration.BuildConfigFromConfigFile(fi));
         }
 
         /// <summary>
@@ -209,7 +209,7 @@ namespace k8s.Tests
         public void ClusterNotFound()
         {
             var fi = new FileInfo(kubeConfigNoCluster);
-            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => new KubernetesClientConfiguration(fi));
+            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => KubernetesClientConfiguration.BuildConfigFromConfigFile(fi));
         }
 
         /// <summary>
@@ -219,7 +219,7 @@ namespace k8s.Tests
         public void ClusterNameMissmatch()
         {
             var fi = new FileInfo(kubeConfigClusterMissmatch);
-            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => new KubernetesClientConfiguration(fi));
+            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => KubernetesClientConfiguration.BuildConfigFromConfigFile(fi));
         }
 
         /// <summary>
@@ -229,7 +229,7 @@ namespace k8s.Tests
         public void CheckClusterTlsCorrectness()
         {
             var fi = new FileInfo(kubeConfigTlsNoSkipError);
-            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => new KubernetesClientConfiguration(fi));
+            Assert.Throws<k8s.Exceptions.KubeConfigException>(() => KubernetesClientConfiguration.BuildConfigFromConfigFile(fi));
         }
 
         /// <summary>
@@ -239,7 +239,7 @@ namespace k8s.Tests
         public void CheckClusterTlsSkipCorrectness()
         {
             var fi = new FileInfo(kubeConfigTlsSkip);
-            var cfg = new KubernetesClientConfiguration(fi);
+            var cfg = KubernetesClientConfiguration.BuildConfigFromConfigFile(fi);
             Assert.NotNull(cfg.Host);
             Assert.Null(cfg.SslCaCert);
             Assert.True(cfg.SkipTlsVerify);
@@ -251,7 +251,7 @@ namespace k8s.Tests
         // [Fact]
         // public void ListDefaultNamespacedPod()
         // {
-        //     var k8sClientConfig = new KubernetesClientConfiguration();
+        //     var k8sClientConfig = KubernetesClientConfiguration.BuildConfigFromConfigFile();
         //     IKubernetes client = new Kubernetes(k8sClientConfig);
         //     var listTask = client.ListNamespacedPodWithHttpMessagesAsync("default").Result;
         //     var list = listTask.Body;