diff --git a/config.go b/config.go
index 5257c382a..87747be5c 100644
--- a/config.go
+++ b/config.go
@@ -51,7 +51,7 @@ func init() {
 // On Windows, this is the "terraform.rc" file in the application data
 // directory.
 func ConfigFile() (string, error) {
-    return configFile()
+	return configFile()
 }
 
 // LoadConfig loads the CLI configuration from ".terraformrc" files.
diff --git a/helper/schema/set_test.go b/helper/schema/set_test.go
index 7a5778af4..7c9caa96e 100644
--- a/helper/schema/set_test.go
+++ b/helper/schema/set_test.go
@@ -32,7 +32,7 @@ func TestSetContains(t *testing.T) {
 
 func TestSetDifference(t *testing.T) {
 	s1 := &Set{F: testSetInt}
-	s2:= &Set{F: testSetInt}
+	s2 := &Set{F: testSetInt}
 
 	s1.Add(1)
 	s1.Add(5)
@@ -49,7 +49,7 @@ func TestSetDifference(t *testing.T) {
 
 func TestSetIntersection(t *testing.T) {
 	s1 := &Set{F: testSetInt}
-	s2:= &Set{F: testSetInt}
+	s2 := &Set{F: testSetInt}
 
 	s1.Add(1)
 	s1.Add(5)
@@ -66,7 +66,7 @@ func TestSetIntersection(t *testing.T) {
 
 func TestSetUnion(t *testing.T) {
 	s1 := &Set{F: testSetInt}
-	s2:= &Set{F: testSetInt}
+	s2 := &Set{F: testSetInt}
 
 	s1.Add(1)
 	s1.Add(5)
diff --git a/helper/ssh/communicator.go b/helper/ssh/communicator.go
index 11f627521..f82c56d2c 100644
--- a/helper/ssh/communicator.go
+++ b/helper/ssh/communicator.go
@@ -218,7 +218,7 @@ func (c *SSHCommunicator) UploadDir(dst string, src string, excl []string) error
 		if src[len(src)-1] != '/' {
 			log.Printf("No trailing slash, creating the source directory name")
 			return scpUploadDirProtocol(filepath.Base(src), w, r, uploadEntries)
-		} 
+		}
 		// Trailing slash, so only upload the contents
 		return uploadEntries()
 	}