diff --git a/cmd/helm/create.go b/cmd/helm/create.go
index 1cf1e949c..fff8778ae 100644
--- a/cmd/helm/create.go
+++ b/cmd/helm/create.go
@@ -55,9 +55,6 @@ func runCreate(cmd *cobra.Command, args []string) error {
 		Version:     "0.1.0",
 	}
 
-	if _, err := chart.Create(&cfile, filepath.Dir(cname)); err != nil {
-		return err
-	}
-
-	return nil
+	_, err := chart.Create(&cfile, filepath.Dir(cname))
+	return err
 }
diff --git a/cmd/helm/helm.go b/cmd/helm/helm.go
index d995f5eaf..27af59757 100644
--- a/cmd/helm/helm.go
+++ b/cmd/helm/helm.go
@@ -12,10 +12,8 @@ import (
 )
 
 const (
-	homeEnvVar  = "HELM_HOME"
-	defaultHome = "$HOME/.helm" // FIXME: is $HOME windows compatible?
-	hostEnvVar  = "HELM_HOST"
-	defaultHost = ":44134"
+	homeEnvVar = "HELM_HOME"
+	hostEnvVar = "HELM_HOST"
 )
 
 var helmHome string
diff --git a/cmd/helm/install.go b/cmd/helm/install.go
index c1a260cda..5494a9467 100644
--- a/cmd/helm/install.go
+++ b/cmd/helm/install.go
@@ -24,8 +24,6 @@ chart in the current working directory.
 
 // install flags & args
 var (
-	// installArg is the name or relative path of the chart to install
-	installArg string
 	// installDryRun performs a dry-run install
 	installDryRun bool
 	// installValues is the filename of supplied values.
diff --git a/cmd/helm/repo.go b/cmd/helm/repo.go
index cb09b0046..6c0119da0 100644
--- a/cmd/helm/repo.go
+++ b/cmd/helm/repo.go
@@ -89,10 +89,7 @@ func runRepoRemove(cmd *cobra.Command, args []string) error {
 	if err := checkArgsLength(1, len(args), "name of chart repository"); err != nil {
 		return err
 	}
-	if err := removeRepoLine(args[0]); err != nil {
-		return err
-	}
-	return nil
+	return removeRepoLine(args[0])
 }
 
 func runRepoIndex(cmd *cobra.Command, args []string) error {
@@ -105,11 +102,7 @@ func runRepoIndex(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	if err := index(path, args[1]); err != nil {
-		return err
-	}
-
-	return nil
+	return index(path, args[1])
 }
 
 func index(dir, url string) error {
@@ -118,10 +111,7 @@ func index(dir, url string) error {
 		return err
 	}
 
-	if err := chartRepo.Index(); err != nil {
-		return err
-	}
-	return nil
+	return chartRepo.Index()
 }
 
 func removeRepoLine(name string) error {
@@ -165,9 +155,5 @@ func insertRepoLine(name, url string) error {
 	f.Repositories[name] = url
 
 	b, _ := yaml.Marshal(&f.Repositories)
-	if err := ioutil.WriteFile(repositoriesFile(), b, 0666); err != nil {
-		return err
-	}
-
-	return nil
+	return ioutil.WriteFile(repositoriesFile(), b, 0666)
 }
diff --git a/cmd/helm/tunnel.go b/cmd/helm/tunnel.go
index 97de02960..a626ff59f 100644
--- a/cmd/helm/tunnel.go
+++ b/cmd/helm/tunnel.go
@@ -17,7 +17,7 @@ func newTillerPortForwarder() (*kube.Tunnel, error) {
 	if err != nil {
 		return nil, err
 	}
-	// FIXME use a constain that is accessable on init
+	// FIXME use a constain that is accessible on init
 	const tillerPort = 44134
 	return kube.New(nil).ForwardPort("helm", podName, tillerPort)
 }
diff --git a/pkg/chart/chart_test.go b/pkg/chart/chart_test.go
index f7c804c1e..6ed4e4f84 100644
--- a/pkg/chart/chart_test.go
+++ b/pkg/chart/chart_test.go
@@ -191,11 +191,7 @@ func findMember(root, path string, members []*Member) error {
 	for _, member := range members {
 		if member.Path == path {
 			filename := filepath.Join(root, path)
-			if err := compareContent(filename, member.Content); err != nil {
-				return err
-			}
-
-			return nil
+			return compareContent(filename, member.Content)
 		}
 	}
 
diff --git a/pkg/chart/save.go b/pkg/chart/save.go
index d6fc5600e..5b8b302ed 100644
--- a/pkg/chart/save.go
+++ b/pkg/chart/save.go
@@ -103,11 +103,7 @@ func Save(c *Chart, outDir string) (string, error) {
 		}
 		_, err = io.Copy(twriter, in)
 		in.Close()
-		if err != nil {
-			return err
-		}
-
-		return nil
+		return err
 	})
 	if err != nil {
 		rollback = true
diff --git a/pkg/repo/local.go b/pkg/repo/local.go
index ec6e13a07..2dbdb98e5 100644
--- a/pkg/repo/local.go
+++ b/pkg/repo/local.go
@@ -46,11 +46,7 @@ func AddChartToLocalRepo(ch *chart.Chart, path string) error {
 	if err != nil {
 		return err
 	}
-	err = Reindex(ch, path+"/index.yaml")
-	if err != nil {
-		return err
-	}
-	return nil
+	return Reindex(ch, path+"/index.yaml")
 }
 
 // Reindex adds an entry to the index file at the given path
diff --git a/pkg/repo/repo.go b/pkg/repo/repo.go
index b5a388020..5da66911e 100644
--- a/pkg/repo/repo.go
+++ b/pkg/repo/repo.go
@@ -98,11 +98,7 @@ func (r *ChartRepository) saveIndexFile() error {
 		return err
 	}
 
-	if err = ioutil.WriteFile(filepath.Join(r.RootPath, indexPath), index, 0644); err != nil {
-		return err
-	}
-
-	return nil
+	return ioutil.WriteFile(filepath.Join(r.RootPath, indexPath), index, 0644)
 }
 
 func (r *ChartRepository) Index() error {
@@ -143,11 +139,7 @@ func (r *ChartRepository) Index() error {
 
 	}
 
-	if err := r.saveIndexFile(); err != nil {
-		return err
-	}
-
-	return nil
+	return r.saveIndexFile()
 }
 
 func generateChecksum(path string) (string, error) {