diff --git a/cmd/control/cloud-config.go b/cmd/control/cloud-config.go
index 656fe311..b720d37f 100644
--- a/cmd/control/cloud-config.go
+++ b/cmd/control/cloud-config.go
@@ -67,8 +67,8 @@ var (
 		sshKeyName     string
 		oem            string
 		validate       bool
-		preInit	       bool
-		outDir	       string
+		preInit        bool
+		outDir         string
 	}{}
 )
 
@@ -239,12 +239,12 @@ func CloudInit() {
 		}
 
 		outFile := outDir + "cloud-config"
-		
+
 		if err := ioutil.WriteFile(outFile, fileData, 444); err != nil {
 			fmt.Println("Error while writing file ", err.Error())
 			os.Exit(1)
 		}
-		
+
 		os.Exit(0)
 	}
 
@@ -403,4 +403,3 @@ func runScript(script config.Script, env *initialize.Environment) error {
 	}
 	return err
 }
-
diff --git a/config/config.go b/config/config.go
index 3b35c2e8..3825180c 100644
--- a/config/config.go
+++ b/config/config.go
@@ -46,17 +46,17 @@ type Config struct {
 	RescueContainer  *ContainerConfig  `yaml:"rescue_container,omitempty"`
 	State            ConfigState       `yaml:"state,omitempty"`
 	Userdocker       UserDockerInfo    `yaml:"userdocker,omitempty"`
-	CloudConfig	 []string	   `yaml:"cloud_config,omitempty"`
+	CloudConfig      []string          `yaml:"cloud_config,omitempty"`
 	SystemContainers []ContainerConfig `yaml:"system_containers,omitempty"`
 	SystemDockerArgs []string          `yaml:"system_docker_args,flow,omitempty"`
 	Modules          []string          `yaml:"modules,omitempty"`
 }
 
 type UserDockerInfo struct {
-	UseTLS 		bool 	`yaml:"use_tls,omitempty"`
-	TLSServerCert 	string	`yaml:"tls_server_cert"`
-	TLSServerKey 	string	`yaml:"tls_server_key"`
-	TLSCACert 	string	`yaml:"tls_ca_cert"`
+	UseTLS        bool   `yaml:"use_tls,omitempty"`
+	TLSServerCert string `yaml:"tls_server_cert"`
+	TLSServerKey  string `yaml:"tls_server_key"`
+	TLSCACert     string `yaml:"tls_ca_cert"`
 }
 
 type ConfigState struct {
diff --git a/config/default.go b/config/default.go
index 0027cb5f..2eafe86d 100644
--- a/config/default.go
+++ b/config/default.go
@@ -15,8 +15,8 @@ func NewConfig() *Config {
 		SystemDockerArgs: []string{"docker", "-d", "-s", "overlay", "-b", "none", "--restart=false", "-H", DOCKER_SYSTEM_HOST},
 		Modules:          []string{},
 		Userdocker: UserDockerInfo{
-				UseTLS: true,
-			},
+			UseTLS: true,
+		},
 		CloudConfig: []string{},
 		SystemContainers: []ContainerConfig{
 			{
@@ -32,7 +32,6 @@ func NewConfig() *Config {
 				Cmd: "--name=console-volumes " +
 					"--net=none " +
 					"--read-only " +
-
 					"-v=/init:/sbin/halt:ro " +
 					"-v=/init:/sbin/poweroff:ro " +
 					"-v=/init:/sbin/reboot:ro " +
@@ -61,7 +60,7 @@ func NewConfig() *Config {
 					"--net=host " +
 					"-v=/init:/usr/bin/rancherctl:ro " +
 					"-v=/init:/usr/bin/cloudinit:ro " +
-					"cloudconfig", 
+					"cloudconfig",
 			},
 			{
 				Cmd: "--name=network " +