diff --git a/cmd/control/config.go b/cmd/control/config.go
index b7ebca1e..da4e0f89 100644
--- a/cmd/control/config.go
+++ b/cmd/control/config.go
@@ -160,11 +160,7 @@ func editSyslinux(c *cli.Context) error {
 		"rancher/os-console:"+config.Version,
 		"boot/global.cfg")
 	cmd.Stdout, cmd.Stderr, cmd.Stdin = os.Stdout, os.Stderr, os.Stdin
-	if err := cmd.Run(); err != nil {
-		return err
-	}
-
-	return nil
+	return cmd.Run()
 }
 
 func configSet(c *cli.Context) error {
diff --git a/cmd/control/install.go b/cmd/control/install.go
index 4af6695c..01071359 100755
--- a/cmd/control/install.go
+++ b/cmd/control/install.go
@@ -216,10 +216,7 @@ func runInstall(image, installType, cloudConfig, device, partition, statedir, ka
 					"--volumes-from=command-volumes", image, "-d", device, "-t", installType, "-c", cloudConfig,
 					"-a", kappend)
 				cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr
-				if err := cmd.Run(); err != nil {
-					return err
-				}
-				return nil
+				return cmd.Run()
 			}
 		}
 	}
@@ -308,10 +305,7 @@ func runInstall(image, installType, cloudConfig, device, partition, statedir, ka
 			cmd := exec.Command("system-docker", installerCmd...)
 			log.Debugf("Run(%v)", cmd)
 			cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr
-			if err := cmd.Run(); err != nil {
-				return err
-			}
-			return nil
+			return cmd.Run()
 		}
 	}
 
@@ -687,11 +681,7 @@ func setDiskpartitions(device, diskType string) error {
 		log.Errorf("parted: %s", err)
 		return err
 	}
-	if err := setBootable(device, diskType); err != nil {
-		return err
-	}
-
-	return nil
+	return setBootable(device, diskType)
 }
 
 func partitionMounted(device string, file io.Reader) bool {
diff --git a/cmd/control/tlsconf.go b/cmd/control/tlsconf.go
index df8a64cb..708c9e99 100644
--- a/cmd/control/tlsconf.go
+++ b/cmd/control/tlsconf.go
@@ -76,11 +76,7 @@ func writeCerts(generateServer bool, hostname []string, certPath, keyPath, caCer
 	if err := config.Set("rancher.docker.server_cert", string(cert)); err != nil {
 		return err
 	}
-	if err := config.Set("rancher.docker.server_key", string(key)); err != nil {
-		return err
-	}
-
-	return nil
+	return config.Set("rancher.docker.server_key", string(key))
 }
 
 func writeCaCerts(cfg *config.CloudConfig, caCertPath, caKeyPath string) error {
diff --git a/config/cloudinit/initialize/workspace.go b/config/cloudinit/initialize/workspace.go
index 08ed2ae2..5aeaae56 100644
--- a/config/cloudinit/initialize/workspace.go
+++ b/config/cloudinit/initialize/workspace.go
@@ -29,11 +29,7 @@ func PrepWorkspace(workspace string) error {
 	}
 
 	scripts := path.Join(workspace, "scripts")
-	if err := system.EnsureDirectoryExists(scripts); err != nil {
-		return err
-	}
-
-	return nil
+	return system.EnsureDirectoryExists(scripts)
 }
 
 func PersistScriptInWorkspace(script config.Script, workspace string) (string, error) {
diff --git a/dfs/scratch.go b/dfs/scratch.go
index 04b655f8..1be374ec 100644
--- a/dfs/scratch.go
+++ b/dfs/scratch.go
@@ -215,11 +215,7 @@ func execDocker(config *Config, docker, cmd string, args []string) (*exec.Cmd, e
 
 func copyDefault(folder, name string) error {
 	defaultFile := path.Join(defaultPrefix, folder, name)
-	if err := CopyFile(defaultFile, folder, name); err != nil {
-		return err
-	}
-
-	return nil
+	return CopyFile(defaultFile, folder, name)
 }
 
 func copyDefaultFolder(folder string) error {
@@ -453,11 +449,7 @@ func PrepareFs(config *Config) error {
 		return err
 	}
 
-	if err := firstPrepare(); err != nil {
-		return err
-	}
-
-	return nil
+	return firstPrepare()
 }
 
 func touchSocket(path string) error {
@@ -581,11 +573,7 @@ func firstPrepare() error {
 		return err
 	}
 
-	if err := createGroup(); err != nil {
-		return err
-	}
-
-	return nil
+	return createGroup()
 }
 
 func secondPrepare(config *Config, docker string, args ...string) error {
diff --git a/hostname/hostname.go b/hostname/hostname.go
index f7d0b299..a667bbd1 100644
--- a/hostname/hostname.go
+++ b/hostname/hostname.go
@@ -23,11 +23,7 @@ func SetHostnameFromCloudConfig(cc *config.CloudConfig) error {
 	}
 
 	// set hostname
-	if err := syscall.Sethostname([]byte(hostname)); err != nil {
-		return err
-	}
-
-	return nil
+	return syscall.Sethostname([]byte(hostname))
 }
 
 func SyncHostname() error {
@@ -55,9 +51,5 @@ func SyncHostname() error {
 		}
 		hostsContent += line + "\n"
 	}
-	if err := ioutil.WriteFile("/etc/hosts", []byte(hostsContent), 0600); err != nil {
-		return err
-	}
-
-	return nil
+	return ioutil.WriteFile("/etc/hosts", []byte(hostsContent), 0600)
 }
diff --git a/netconf/netconf_linux.go b/netconf/netconf_linux.go
index 4221f4fe..8f399f2c 100755
--- a/netconf/netconf_linux.go
+++ b/netconf/netconf_linux.go
@@ -358,10 +358,7 @@ func applyInterfaceConfig(link netlink.Link, netConf InterfaceConfig) error {
 		if err != nil {
 			return err
 		}
-		if err := b.AddSlave(link.Attrs().Name); err != nil {
-			return err
-		}
-		return nil
+		return b.AddSlave(link.Attrs().Name)
 	}
 
 	//TODO: undo
diff --git a/util/util.go b/util/util.go
index 91c5c1ee..6444c2fa 100644
--- a/util/util.go
+++ b/util/util.go
@@ -90,11 +90,7 @@ func ConvertIgnoreOmitEmpty(from, to interface{}) error {
 
 	decoder := yaml.NewDecoder(&buffer)
 
-	if err := decoder.Decode(to); err != nil {
-		return err
-	}
-
-	return nil
+	return decoder.Decode(to)
 }
 
 func Copy(d interface{}) interface{} {