diff --git a/api.go b/api.go
index 073a469522..91b61c82ac 100644
--- a/api.go
+++ b/api.go
@@ -368,9 +368,9 @@ func ListenAndServe(addr string, srv *Server) error {
 	r.Path("/images/search").Methods("GET").HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		log.Println(r.Method, r.RequestURI)
 		if err := r.ParseForm(); err != nil {
-                        http.Error(w, err.Error(), http.StatusInternalServerError)
-                        return
-                }
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
 
 		term := r.Form.Get("term")
 		outs, err := srv.ImagesSearch(term)
@@ -379,12 +379,12 @@ func ListenAndServe(addr string, srv *Server) error {
 			return
 		}
 		b, err := json.Marshal(outs)
-                if err != nil {
-                        http.Error(w, err.Error(), http.StatusInternalServerError)
-                } else {
-                        w.Header().Set("Content-Type", "application/json")
-                        w.Write(b)
-                }
+		if err != nil {
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+		} else {
+			w.Header().Set("Content-Type", "application/json")
+			w.Write(b)
+		}
 	})
 
 	r.Path("/images/{name:*.}/insert").Methods("POST").HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
diff --git a/api_params.go b/api_params.go
index d57637abd7..c727b2b292 100644
--- a/api_params.go
+++ b/api_params.go
@@ -32,7 +32,7 @@ type ApiContainers struct {
 }
 
 type ApiSearch struct {
-	Name string
+	Name        string
 	Description string
 }
 
diff --git a/commands.go b/commands.go
index d693bfc857..2af25440dc 100644
--- a/commands.go
+++ b/commands.go
@@ -53,7 +53,7 @@ func ParseCommands(args ...string) error {
 
 	cmds := map[string]func(args ...string) error{
 		"attach":  CmdAttach,
-		"build": CmdBuild,
+		"build":   CmdBuild,
 		"commit":  CmdCommit,
 		"diff":    CmdDiff,
 		"export":  CmdExport,
@@ -75,7 +75,7 @@ func ParseCommands(args ...string) error {
 		"rmi":     CmdRmi,
 		"run":     CmdRun,
 		"tag":     CmdTag,
-		"search":	CmdSearch,
+		"search":  CmdSearch,
 		"start":   CmdStart,
 		"stop":    CmdStop,
 		"version": CmdVersion,
@@ -960,19 +960,19 @@ func CmdSearch(args ...string) error {
 		cmd.Usage()
 		return nil
 	}
-	
-	v := url.Values{}
-        v.Set("term", cmd.Arg(0))
-	body, _, err := call("GET", "/images/search?"+v.Encode(), nil)
-        if err != nil {
-                return err
-        }
 
-        var outs []ApiSearch
-        err = json.Unmarshal(body, &outs)
-        if err != nil {
-                return err
-        }
+	v := url.Values{}
+	v.Set("term", cmd.Arg(0))
+	body, _, err := call("GET", "/images/search?"+v.Encode(), nil)
+	if err != nil {
+		return err
+	}
+
+	var outs []ApiSearch
+	err = json.Unmarshal(body, &outs)
+	if err != nil {
+		return err
+	}
 	fmt.Printf("Found %d results matching your query (\"%s\")\n", len(outs), cmd.Arg(0))
 	w := tabwriter.NewWriter(os.Stdout, 20, 1, 3, ' ', 0)
 	fmt.Fprintf(w, "NAME\tDESCRIPTION\n")
@@ -1080,10 +1080,6 @@ func CmdRun(args ...string) error {
 		cmd.Usage()
 		return nil
 	}
-	if len(config.Cmd) == 0 {
-		cmd.Usage()
-		return nil
-	}
 
 	//create the container
 	body, statusCode, err := call("POST", "/containers", *config)
diff --git a/server.go b/server.go
index 00d5c73491..df81706aa1 100644
--- a/server.go
+++ b/server.go
@@ -46,16 +46,16 @@ func (srv *Server) ContainerExport(name string, file *os.File) error {
 func (srv *Server) ImagesSearch(term string) ([]ApiSearch, error) {
 	results, err := srv.runtime.graph.SearchRepositories(nil, term)
 	if err != nil {
-                return nil, err
-        }
-	
+		return nil, err
+	}
+
 	var outs []ApiSearch
 	for _, repo := range results.Results {
 		var out ApiSearch
 		out.Description = repo["description"]
-                if len(out.Description) > 45 {
-                        out.Description = Trunc(out.Description, 42) + "..."
-                }
+		if len(out.Description) > 45 {
+			out.Description = Trunc(out.Description, 42) + "..."
+		}
 		out.Name = repo["name"]
 		outs = append(outs, out)
 	}