diff --git a/builtin/providers/aws/resource_aws_route.go b/builtin/providers/aws/resource_aws_route.go
index 96f731484..60c666ecd 100644
--- a/builtin/providers/aws/resource_aws_route.go
+++ b/builtin/providers/aws/resource_aws_route.go
@@ -206,7 +206,7 @@ func resourceAwsRouteUpdate(d *schema.ResourceData, meta interface{}) error {
 			DestinationCidrBlock: aws.String(d.Get("destination_cidr_block").(string)),
 			InstanceId:           aws.String(d.Get("instance_id").(string)),
 			//NOOP: Ensure we don't blow away network interface id that is set after instance is launched
-			NetworkInterfaceId:	  aws.String(d.Get("network_interface_id").(string)),
+			NetworkInterfaceId: aws.String(d.Get("network_interface_id").(string)),
 		}
 	case "network_interface_id":
 		replaceOpts = &ec2.ReplaceRouteInput{
diff --git a/builtin/providers/aws/resource_aws_route_test.go b/builtin/providers/aws/resource_aws_route_test.go
index 2e59e35aa..d4f418fee 100644
--- a/builtin/providers/aws/resource_aws_route_test.go
+++ b/builtin/providers/aws/resource_aws_route_test.go
@@ -17,7 +17,7 @@ func TestAccAWSRoute_basic(t *testing.T) {
 		if *route.DestinationCidrBlock != "10.3.0.0/16" {
 			return fmt.Errorf("Destination Cidr (Expected=%s, Actual=%s)\n", "10.3.0.0/16", *route.DestinationCidrBlock)
 		}
-		
+
 		name := "aws_internet_gateway.foo"
 		gwres, ok := s.RootModule().Resources[name]
 		if !ok {
@@ -27,7 +27,7 @@ func TestAccAWSRoute_basic(t *testing.T) {
 		if *route.GatewayId != gwres.Primary.ID {
 			return fmt.Errorf("Internet Gateway Id (Expected=%s, Actual=%s)\n", gwres.Primary.ID, *route.GatewayId)
 		}
-		
+
 		return nil
 	}
 
diff --git a/builtin/providers/google/config.go b/builtin/providers/google/config.go
index 567ab1322..4acb2ce96 100644
--- a/builtin/providers/google/config.go
+++ b/builtin/providers/google/config.go
@@ -42,7 +42,6 @@ func (c *Config) loadAndValidate() error {
 		"https://www.googleapis.com/auth/devstorage.full_control",
 	}
 
-
 	if c.AccountFile == "" {
 		c.AccountFile = os.Getenv("GOOGLE_ACCOUNT_FILE")
 	}
@@ -104,7 +103,7 @@ func (c *Config) loadAndValidate() error {
 		client = conf.Client(oauth2.NoContext)
 
 	} else {
-		log.Printf("[INFO] Authenticating using DefaultClient");
+		log.Printf("[INFO] Authenticating using DefaultClient")
 		err := error(nil)
 		client, err = google.DefaultClient(oauth2.NoContext, clientScopes...)
 		if err != nil {
diff --git a/builtin/providers/google/resource_compute_instance.go b/builtin/providers/google/resource_compute_instance.go
index e3f002404..808c5de78 100644
--- a/builtin/providers/google/resource_compute_instance.go
+++ b/builtin/providers/google/resource_compute_instance.go
@@ -775,7 +775,7 @@ func resourceComputeInstanceUpdate(d *schema.ResourceData, meta interface{}) err
 			scheduling.OnHostMaintenance = val.(string)
 		}
 
-		op, err := config.clientCompute.Instances.SetScheduling(config.Project, 
+		op, err := config.clientCompute.Instances.SetScheduling(config.Project,
 			zone, d.Id(), scheduling).Do()
 
 		if err != nil {
@@ -788,7 +788,7 @@ func resourceComputeInstanceUpdate(d *schema.ResourceData, meta interface{}) err
 			return opErr
 		}
 
-		d.SetPartial("scheduling");
+		d.SetPartial("scheduling")
 	}
 
 	networkInterfacesCount := d.Get("network_interface.#").(int)
diff --git a/builtin/providers/google/resource_compute_instance_group_manager.go b/builtin/providers/google/resource_compute_instance_group_manager.go
index 938738146..b0186b707 100644
--- a/builtin/providers/google/resource_compute_instance_group_manager.go
+++ b/builtin/providers/google/resource_compute_instance_group_manager.go
@@ -255,14 +255,14 @@ func resourceComputeInstanceGroupManagerDelete(d *schema.ResourceData, meta inte
 
 	for err != nil && currentSize > 0 {
 		if !strings.Contains(err.Error(), "timeout") {
-			return err;
+			return err
 		}
 
 		instanceGroup, err := config.clientCompute.InstanceGroups.Get(
 			config.Project, d.Get("zone").(string), d.Id()).Do()
 
 		if err != nil {
-			return fmt.Errorf("Error getting instance group size: %s", err);
+			return fmt.Errorf("Error getting instance group size: %s", err)
 		}
 
 		if instanceGroup.Size >= currentSize {