diff --git a/daemon/attach.go b/daemon/attach.go
index b1b06e2765..13824ea842 100644
--- a/daemon/attach.go
+++ b/daemon/attach.go
@@ -127,7 +127,7 @@ func (daemon *Daemon) Attach(container *Container, stdin io.ReadCloser, stdinClo
 	)
 
 	if stdin != nil && container.Config.OpenStdin {
-		nJobs += 1
+		nJobs++
 		if cStdin, err := container.StdinPipe(); err != nil {
 			errors <- err
 		} else {
@@ -163,7 +163,7 @@ func (daemon *Daemon) Attach(container *Container, stdin io.ReadCloser, stdinClo
 		}
 	}
 	if stdout != nil {
-		nJobs += 1
+		nJobs++
 		if p, err := container.StdoutPipe(); err != nil {
 			errors <- err
 		} else {
@@ -201,7 +201,7 @@ func (daemon *Daemon) Attach(container *Container, stdin io.ReadCloser, stdinClo
 		}()
 	}
 	if stderr != nil {
-		nJobs += 1
+		nJobs++
 		if p, err := container.StderrPipe(); err != nil {
 			errors <- err
 		} else {
@@ -252,7 +252,7 @@ func (daemon *Daemon) Attach(container *Container, stdin io.ReadCloser, stdinClo
 
 		// FIXME: how to clean up the stdin goroutine without the unwanted side effect
 		// of closing the passed stdin? Add an intermediary io.Pipe?
-		for i := 0; i < nJobs; i += 1 {
+		for i := 0; i < nJobs; i++ {
 			log.Debugf("attach: waiting for job %d/%d", i+1, nJobs)
 			if err := <-errors; err != nil {
 				log.Errorf("attach: job %d returned error %s, aborting all jobs", i+1, err)
diff --git a/daemon/build.go b/daemon/build.go
index a572dc2ec2..6812139663 100644
--- a/daemon/build.go
+++ b/daemon/build.go
@@ -476,19 +476,17 @@ func (b *buildFile) CmdVolume(args string) error {
 
 func (b *buildFile) checkPathForAddition(orig string) error {
 	origPath := path.Join(b.contextPath, orig)
-	if p, err := filepath.EvalSymlinks(origPath); err != nil {
+	origPath, err := filepath.EvalSymlinks(origPath)
+	if err != nil {
 		if os.IsNotExist(err) {
 			return fmt.Errorf("%s: no such file or directory", orig)
 		}
 		return err
-	} else {
-		origPath = p
 	}
 	if !strings.HasPrefix(origPath, b.contextPath) {
 		return fmt.Errorf("Forbidden path outside the build context: %s (%s)", orig, origPath)
 	}
-	_, err := os.Stat(origPath)
-	if err != nil {
+	if _, err := os.Stat(origPath); err != nil {
 		if os.IsNotExist(err) {
 			return fmt.Errorf("%s: no such file or directory", orig)
 		}
@@ -908,7 +906,7 @@ func (b *buildFile) Build(context io.Reader) (string, error) {
 		} else if b.rm {
 			b.clearTmp(b.tmpContainers)
 		}
-		stepN += 1
+		stepN++
 	}
 	if b.image != "" {
 		fmt.Fprintf(b.outStream, "Successfully built %s\n", utils.TruncateID(b.image))
diff --git a/daemon/container.go b/daemon/container.go
index 0d7023c688..59571ed814 100644
--- a/daemon/container.go
+++ b/daemon/container.go
@@ -910,7 +910,8 @@ func (container *Container) initializeNetworking() error {
 		container.HostsPath = hostsPath
 
 		return ioutil.WriteFile(container.HostsPath, content, 0644)
-	} else if container.hostConfig.NetworkMode.IsContainer() {
+	}
+	if container.hostConfig.NetworkMode.IsContainer() {
 		// we need to get the hosts files from the container to join
 		nc, err := container.getNetworkedContainer()
 		if err != nil {
@@ -920,16 +921,16 @@ func (container *Container) initializeNetworking() error {
 		container.ResolvConfPath = nc.ResolvConfPath
 		container.Config.Hostname = nc.Config.Hostname
 		container.Config.Domainname = nc.Config.Domainname
-	} else if container.daemon.config.DisableNetwork {
+		return nil
+	}
+	if container.daemon.config.DisableNetwork {
 		container.Config.NetworkDisabled = true
 		return container.buildHostnameAndHostsFiles("127.0.1.1")
-	} else {
-		if err := container.allocateNetwork(); err != nil {
-			return err
-		}
-		return container.buildHostnameAndHostsFiles(container.NetworkSettings.IPAddress)
 	}
-	return nil
+	if err := container.allocateNetwork(); err != nil {
+		return err
+	}
+	return container.buildHostnameAndHostsFiles(container.NetworkSettings.IPAddress)
 }
 
 // Make sure the config is compatible with the current kernel