diff --git a/channels/pkg/channels/channel_version.go b/channels/pkg/channels/channel_version.go
index ca13ea4789..5b8ae97f88 100644
--- a/channels/pkg/channels/channel_version.go
+++ b/channels/pkg/channels/channel_version.go
@@ -131,9 +131,8 @@ func (c *ChannelVersion) replaces(existing *ChannelVersion) bool {
 				if c.ManifestHash == existing.ManifestHash {
 					klog.V(4).Infof("Manifest Match")
 					return false
-				} else {
-					klog.V(4).Infof("Channels had same version and ids %q, %q but different ManifestHash (%q vs %q); will replace", *c.Version, c.Id, c.ManifestHash, existing.ManifestHash)
 				}
+				klog.V(4).Infof("Channels had same version and ids %q, %q but different ManifestHash (%q vs %q); will replace", *c.Version, c.Id, c.ManifestHash, existing.ManifestHash)
 			} else {
 				klog.V(4).Infof("Channels had same version %q but different ids (%q vs %q); will replace", *c.Version, c.Id, existing.Id)
 			}
diff --git a/cloudmock/aws/mockroute53/records.go b/cloudmock/aws/mockroute53/records.go
index 94742b6f5e..3e79b6d559 100644
--- a/cloudmock/aws/mockroute53/records.go
+++ b/cloudmock/aws/mockroute53/records.go
@@ -137,9 +137,8 @@ func (m *MockRoute53) ChangeResourceRecordSets(request *route53.ChangeResourceRe
 			if foundIndex == -1 {
 				// TODO: Use correct error
 				return nil, fmt.Errorf("record not found %s %q", changeType, changeName)
-			} else {
-				zone.records = append(zone.records[:foundIndex], zone.records[foundIndex+1:]...)
 			}
+			zone.records = append(zone.records[:foundIndex], zone.records[foundIndex+1:]...)
 
 		default:
 			// TODO: Use correct error
diff --git a/cmd/kops/create.go b/cmd/kops/create.go
index 18b96adf14..943b84f138 100644
--- a/cmd/kops/create.go
+++ b/cmd/kops/create.go
@@ -183,9 +183,8 @@ func RunCreate(f *util.Factory, out io.Writer, c *CreateOptions) error {
 						return fmt.Errorf("instanceGroup %q already exists", v.ObjectMeta.Name)
 					}
 					return fmt.Errorf("error creating instanceGroup: %v", err)
-				} else {
-					fmt.Fprintf(&sb, "Created instancegroup/%s\n", v.ObjectMeta.Name)
 				}
+				fmt.Fprintf(&sb, "Created instancegroup/%s\n", v.ObjectMeta.Name)
 
 			case *kopsapi.SSHCredential:
 				clusterName = v.ObjectMeta.Labels[kopsapi.LabelClusterName]
diff --git a/cmd/kops/upgrade_cluster.go b/cmd/kops/upgrade_cluster.go
index 50f93d700c..46651ff3e1 100644
--- a/cmd/kops/upgrade_cluster.go
+++ b/cmd/kops/upgrade_cluster.go
@@ -272,27 +272,26 @@ func (c *UpgradeClusterCmd) Run(args []string) error {
 	if !c.Yes {
 		fmt.Printf("\nMust specify --yes to perform upgrade\n")
 		return nil
-	} else {
-		for _, action := range actions {
-			action.apply()
-		}
-
-		if err := commands.UpdateCluster(clientset, cluster, instanceGroups); err != nil {
-			return err
-		}
-
-		for _, g := range instanceGroups {
-			_, err := clientset.InstanceGroupsFor(cluster).Update(g)
-			if err != nil {
-				return fmt.Errorf("error writing InstanceGroup %q: %v", g.ObjectMeta.Name, err)
-			}
-		}
-
-		fmt.Printf("\nUpdates applied to configuration.\n")
-
-		// TODO: automate this step
-		fmt.Printf("You can now apply these changes, using `kops update cluster %s`\n", cluster.ObjectMeta.Name)
 	}
+	for _, action := range actions {
+		action.apply()
+	}
+
+	if err := commands.UpdateCluster(clientset, cluster, instanceGroups); err != nil {
+		return err
+	}
+
+	for _, g := range instanceGroups {
+		_, err := clientset.InstanceGroupsFor(cluster).Update(g)
+		if err != nil {
+			return fmt.Errorf("error writing InstanceGroup %q: %v", g.ObjectMeta.Name, err)
+		}
+	}
+
+	fmt.Printf("\nUpdates applied to configuration.\n")
+
+	// TODO: automate this step
+	fmt.Printf("You can now apply these changes, using `kops update cluster %s`\n", cluster.ObjectMeta.Name)
 
 	return nil
 }
diff --git a/cmd/kops/validate_cluster.go b/cmd/kops/validate_cluster.go
index a89dac3b1c..6594bfc827 100644
--- a/cmd/kops/validate_cluster.go
+++ b/cmd/kops/validate_cluster.go
@@ -139,11 +139,10 @@ func RunValidateCluster(f *util.Factory, cmd *cobra.Command, args []string, out
 		if err != nil {
 			if time.Now().After(timeout) {
 				return nil, fmt.Errorf("unexpected error during validation: %v", err)
-			} else {
-				klog.Warningf("(will retry): unexpected error during validation: %v", err)
-				time.Sleep(pollInterval)
-				continue
 			}
+			klog.Warningf("(will retry): unexpected error during validation: %v", err)
+			time.Sleep(pollInterval)
+			continue
 		}
 
 		switch options.output {
diff --git a/pkg/acls/s3/storage.go b/pkg/acls/s3/storage.go
index 54d187d69d..895ccabb11 100644
--- a/pkg/acls/s3/storage.go
+++ b/pkg/acls/s3/storage.go
@@ -79,9 +79,8 @@ func (s *s3PublicAclStrategy) GetACL(p vfs.Path, cluster *kops.Cluster) (vfs.ACL
 		return &vfs.S3Acl{
 			RequestACL: values.String("public-read"),
 		}, nil
-	} else {
-		klog.V(8).Infof("path %q is not inside the file registry %q, not setting public-read acl", u.Path, config.Path)
 	}
+	klog.V(8).Infof("path %q is not inside the file registry %q, not setting public-read acl", u.Path, config.Path)
 
 	return nil, nil
 }
diff --git a/pkg/apis/kops/channel.go b/pkg/apis/kops/channel.go
index abd7065185..87a050a9af 100644
--- a/pkg/apis/kops/channel.go
+++ b/pkg/apis/kops/channel.go
@@ -140,9 +140,8 @@ func (v *KubernetesVersionSpec) FindRecommendedUpgrade(version semver.Version) (
 	if recommendedVersion.GT(version) {
 		klog.V(2).Infof("RecommendedVersion=%q, Have=%q.  Recommending upgrade", recommendedVersion, version)
 		return recommendedVersion, nil
-	} else {
-		klog.V(4).Infof("RecommendedVersion=%q, Have=%q.  No upgrade needed.", recommendedVersion, version)
 	}
+	klog.V(4).Infof("RecommendedVersion=%q, Have=%q.  No upgrade needed.", recommendedVersion, version)
 	return nil, nil
 }
 
@@ -160,9 +159,8 @@ func (v *KopsVersionSpec) FindRecommendedUpgrade(version semver.Version) (*semve
 	if recommendedVersion.GT(version) {
 		klog.V(2).Infof("RecommendedVersion=%q, Have=%q.  Recommending upgrade", recommendedVersion, version)
 		return &recommendedVersion, nil
-	} else {
-		klog.V(4).Infof("RecommendedVersion=%q, Have=%q.  No upgrade needed.", recommendedVersion, version)
 	}
+	klog.V(4).Infof("RecommendedVersion=%q, Have=%q.  No upgrade needed.", recommendedVersion, version)
 	return nil, nil
 }
 
@@ -180,9 +178,8 @@ func (v *KubernetesVersionSpec) IsUpgradeRequired(version semver.Version) (bool,
 	if requiredVersion.GT(version) {
 		klog.V(2).Infof("RequiredVersion=%q, Have=%q.  Requiring upgrade", requiredVersion, version)
 		return true, nil
-	} else {
-		klog.V(4).Infof("RequiredVersion=%q, Have=%q.  No upgrade needed.", requiredVersion, version)
 	}
+	klog.V(4).Infof("RequiredVersion=%q, Have=%q.  No upgrade needed.", requiredVersion, version)
 	return false, nil
 }
 
@@ -200,9 +197,8 @@ func (v *KopsVersionSpec) IsUpgradeRequired(version semver.Version) (bool, error
 	if requiredVersion.GT(version) {
 		klog.V(2).Infof("RequiredVersion=%q, Have=%q.  Requiring upgrade", requiredVersion, version)
 		return true, nil
-	} else {
-		klog.V(4).Infof("RequiredVersion=%q, Have=%q.  No upgrade needed.", requiredVersion, version)
 	}
+	klog.V(4).Infof("RequiredVersion=%q, Have=%q.  No upgrade needed.", requiredVersion, version)
 	return false, nil
 }
 
diff --git a/pkg/cloudinstances/cloud_instance_group.go b/pkg/cloudinstances/cloud_instance_group.go
index ef26e575ba..c5a51d7a81 100644
--- a/pkg/cloudinstances/cloud_instance_group.go
+++ b/pkg/cloudinstances/cloud_instance_group.go
@@ -79,9 +79,8 @@ func (c *CloudInstanceGroup) NewCloudInstanceGroupMember(instanceId string, newG
 func (c *CloudInstanceGroup) Status() string {
 	if len(c.NeedUpdate) == 0 {
 		return "Ready"
-	} else {
-		return "NeedsUpdate"
 	}
+	return "NeedsUpdate"
 }
 
 // GetNodeMap returns a list of nodes keyed by their external id
diff --git a/pkg/instancegroups/instancegroups.go b/pkg/instancegroups/instancegroups.go
index 4e81d6d6a9..fbe67d80ed 100644
--- a/pkg/instancegroups/instancegroups.go
+++ b/pkg/instancegroups/instancegroups.go
@@ -136,10 +136,9 @@ func (r *RollingUpdateInstanceGroup) RollingUpdate(rollingUpdateData *RollingUpd
 		if err = r.ValidateCluster(rollingUpdateData, cluster, instanceGroupList); err != nil {
 			if rollingUpdateData.FailOnValidate {
 				return fmt.Errorf("error validating cluster: %v", err)
-			} else {
-				klog.V(2).Infof("Ignoring cluster validation error: %v", err)
-				klog.Info("Cluster validation failed, but proceeding since fail-on-validate-error is set to false")
 			}
+			klog.V(2).Infof("Ignoring cluster validation error: %v", err)
+			klog.Info("Cluster validation failed, but proceeding since fail-on-validate-error is set to false")
 		}
 	}
 
@@ -165,9 +164,8 @@ func (r *RollingUpdateInstanceGroup) RollingUpdate(rollingUpdateData *RollingUpd
 				if err = r.DrainNode(u, rollingUpdateData); err != nil {
 					if rollingUpdateData.FailOnDrainError {
 						return fmt.Errorf("failed to drain node %q: %v", nodeName, err)
-					} else {
-						klog.Infof("Ignoring error draining node %q: %v", nodeName, err)
 					}
+					klog.Infof("Ignoring error draining node %q: %v", nodeName, err)
 				}
 			} else {
 				klog.Warningf("Skipping drain of instance %q, because it is not registered in kubernetes", instanceId)
diff --git a/pkg/model/alimodel/scalinggroup.go b/pkg/model/alimodel/scalinggroup.go
index 2d3a6b7ad3..7f6a363428 100644
--- a/pkg/model/alimodel/scalinggroup.go
+++ b/pkg/model/alimodel/scalinggroup.go
@@ -127,9 +127,8 @@ func (b *ScalingGroupModelBuilder) Build(c *fi.ModelBuilderContext) error {
 
 			if err != nil {
 				return err
-			} else {
-				launchConfiguration.SSHKey = b.LinkToSSHKey()
 			}
+			launchConfiguration.SSHKey = b.LinkToSSHKey()
 			if launchConfiguration.UserData, err = b.BootstrapScript.ResourceNodeUp(ig, b.Cluster); err != nil {
 				return err
 			}
diff --git a/pkg/pki/certificate.go b/pkg/pki/certificate.go
index 059f9cd08d..b40bf621b2 100644
--- a/pkg/pki/certificate.go
+++ b/pkg/pki/certificate.go
@@ -102,9 +102,8 @@ func parsePEMCertificate(pemData []byte) (*x509.Certificate, error) {
 		if block.Type == "CERTIFICATE" {
 			klog.V(10).Infof("Parsing pem block: %q", block.Type)
 			return x509.ParseCertificate(block.Bytes)
-		} else {
-			klog.Infof("Ignoring unexpected PEM block: %q", block.Type)
 		}
+		klog.Infof("Ignoring unexpected PEM block: %q", block.Type)
 
 		pemData = rest
 	}
diff --git a/pkg/resources/ali/ali.go b/pkg/resources/ali/ali.go
index 06eecbda81..ef7a2c05ea 100644
--- a/pkg/resources/ali/ali.go
+++ b/pkg/resources/ali/ali.go
@@ -453,11 +453,10 @@ func DeleteRoleRam(cloud fi.Cloud, r *resources.Resource) error {
 	response, err := c.RamClient().ListPoliciesForRole(roleQueryRequest)
 	if err != nil {
 		return fmt.Errorf("err listing Policies for role:%v", err)
-	} else {
-		if len(response.Policies.Policy) != 0 {
-			for _, policy := range response.Policies.Policy {
-				policies = append(policies, policy.PolicyName)
-			}
+	}
+	if len(response.Policies.Policy) != 0 {
+		for _, policy := range response.Policies.Policy {
+			policies = append(policies, policy.PolicyName)
 		}
 	}
 
diff --git a/pkg/util/stringorslice/stringorslice.go b/pkg/util/stringorslice/stringorslice.go
index 49fa745ee6..92f8eeb11b 100644
--- a/pkg/util/stringorslice/stringorslice.go
+++ b/pkg/util/stringorslice/stringorslice.go
@@ -54,15 +54,14 @@ func (s *StringOrSlice) UnmarshalJSON(value []byte) error {
 			return nil
 		}
 		return nil
-	} else {
-		s.forceEncodeAsArray = false
-		var stringValue string
-		if err := json.Unmarshal(value, &stringValue); err != nil {
-			return err
-		}
-		s.values = []string{stringValue}
-		return nil
 	}
+	s.forceEncodeAsArray = false
+	var stringValue string
+	if err := json.Unmarshal(value, &stringValue); err != nil {
+		return err
+	}
+	s.values = []string{stringValue}
+	return nil
 }
 
 // String returns the string value, or the Itoa of the int value.
diff --git a/protokube/pkg/gossip/mesh/peer.go b/protokube/pkg/gossip/mesh/peer.go
index 5ff566a241..06fd9a7cc7 100644
--- a/protokube/pkg/gossip/mesh/peer.go
+++ b/protokube/pkg/gossip/mesh/peer.go
@@ -114,10 +114,9 @@ func (p *peer) OnGossip(buf []byte) (delta mesh.GossipData, err error) {
 		// per OnGossip requirements
 		klog.V(4).Infof("OnGossip %v => delta empty", message)
 		return nil, nil
-	} else {
-		klog.V(4).Infof("OnGossip %v => delta %v", message, deltas)
-		return deltas, nil
 	}
+	klog.V(4).Infof("OnGossip %v => delta %v", message, deltas)
+	return deltas, nil
 }
 
 // Merge the gossiped data represented by buf into our state.
diff --git a/protokube/pkg/protokube/aws_volume.go b/protokube/pkg/protokube/aws_volume.go
index 56711b5192..91a4f92358 100644
--- a/protokube/pkg/protokube/aws_volume.go
+++ b/protokube/pkg/protokube/aws_volume.go
@@ -423,11 +423,10 @@ func (a *AWSVolumes) AttachVolume(volume *Volume) error {
 
 				volume.LocalDevice = device
 				return nil
-			} else {
-				a.releaseDevice(device, volumeID)
-
-				return fmt.Errorf("Unable to attach volume %q, was attached to %q", volumeID, v.AttachedTo)
 			}
+			a.releaseDevice(device, volumeID)
+
+			return fmt.Errorf("Unable to attach volume %q, was attached to %q", volumeID, v.AttachedTo)
 		}
 
 		switch v.Status {
diff --git a/protokube/pkg/protokube/volume_mounter.go b/protokube/pkg/protokube/volume_mounter.go
index 11e1c1c9b4..175a70a379 100644
--- a/protokube/pkg/protokube/volume_mounter.go
+++ b/protokube/pkg/protokube/volume_mounter.go
@@ -178,9 +178,8 @@ func (k *VolumeMountController) safeFormatAndMount(volume *Volume, mountpoint st
 			}
 
 			return fmt.Errorf("found multiple existing mounts of %q at %q", device, mountpoint)
-		} else {
-			klog.Infof("Found existing mount of %q at %q", device, mountpoint)
 		}
+		klog.Infof("Found existing mount of %q at %q", device, mountpoint)
 	}
 
 	// If we're containerized we also want to mount the device (again) into our container