diff --git a/api.go b/api.go
index e522583087..9c2c1fcdba 100644
--- a/api.go
+++ b/api.go
@@ -1094,9 +1094,9 @@ func ServeFd(addr string, handle http.Handler) error {
 
 	// Since ListenFD will return one or more sockets we have
 	// to create a go func to spawn off multiple serves
-	for i, _ := range(ls) {
+	for i, _ := range ls {
 		listener := ls[i]
-		go func () {
+		go func() {
 			httpSrv := http.Server{Handler: handle}
 			chErrors <- httpSrv.Serve(listener)
 		}()
diff --git a/server.go b/server.go
index a9d4a20bfb..14974dec73 100644
--- a/server.go
+++ b/server.go
@@ -9,8 +9,8 @@ import (
 	"github.com/dotcloud/docker/engine"
 	"github.com/dotcloud/docker/pkg/cgroups"
 	"github.com/dotcloud/docker/pkg/graphdb"
-	"github.com/dotcloud/docker/registry"
 	"github.com/dotcloud/docker/pkg/systemd"
+	"github.com/dotcloud/docker/registry"
 	"github.com/dotcloud/docker/utils"
 	"io"
 	"io/ioutil"
@@ -123,7 +123,7 @@ func (srv *Server) ListenAndServe(job *engine.Job) engine.Status {
 
 	for _, protoAddr := range protoAddrs {
 		protoAddrParts := strings.SplitN(protoAddr, "://", 2)
-		go func () {
+		go func() {
 			log.Printf("Listening for HTTP on %s (%s)\n", protoAddrParts[0], protoAddrParts[1])
 			chErrors <- ListenAndServe(protoAddrParts[0], protoAddrParts[1], srv, job.GetenvBool("Logging"))
 		}()