diff --git a/cmd/config/internal/commands/annotate.go b/cmd/config/internal/commands/annotate.go
index e41e75ed2..efe62264e 100644
--- a/cmd/config/internal/commands/annotate.go
+++ b/cmd/config/internal/commands/annotate.go
@@ -102,10 +102,9 @@ func (r *AnnotateRunner) ExecuteCmd(w io.Writer, pkgPath string) error {
 		// return err if there is only package
 		if !r.RecurseSubPackages {
 			return err
-		} else {
-			// print error message and continue if there are multiple packages to annotate
-			fmt.Fprintf(w, "%s\n", err.Error())
 		}
+		// print error message and continue if there are multiple packages to annotate
+		fmt.Fprintf(w, "%s\n", err.Error())
 	} else {
 		fmt.Fprint(w, "added annotations in the package\n")
 	}
diff --git a/cmd/config/internal/commands/cat.go b/cmd/config/internal/commands/cat.go
index 9c9a3bd46..b1ae1ecbf 100644
--- a/cmd/config/internal/commands/cat.go
+++ b/cmd/config/internal/commands/cat.go
@@ -138,10 +138,9 @@ func (r *CatRunner) ExecuteCmd(w io.Writer, pkgPath string) error {
 		// return err if there is only package
 		if !r.RecurseSubPackages {
 			return err
-		} else {
-			// print error message and continue if there are multiple packages to annotate
-			fmt.Fprintf(w, "%s in package %q\n", err.Error(), pkgPath)
 		}
+		// print error message and continue if there are multiple packages to annotate
+		fmt.Fprintf(w, "%s in package %q\n", err.Error(), pkgPath)
 	}
 	fmt.Fprint(w, out.String())
 	if out.String() != "" {
diff --git a/cmd/config/internal/commands/cmdcreatesetter.go b/cmd/config/internal/commands/cmdcreatesetter.go
index a216651e7..eca082775 100644
--- a/cmd/config/internal/commands/cmdcreatesetter.go
+++ b/cmd/config/internal/commands/cmdcreatesetter.go
@@ -196,10 +196,9 @@ func (r *CreateSetterRunner) ExecuteCmd(w io.Writer, pkgPath string) error {
 		// return err if RecurseSubPackages is false
 		if !r.CreateSetter.RecurseSubPackages {
 			return err
-		} else {
-			// print error message and continue if RecurseSubPackages is true
-			fmt.Fprintf(w, "%s\n", err.Error())
 		}
+		// print error message and continue if RecurseSubPackages is true
+		fmt.Fprintf(w, "%s\n", err.Error())
 	} else {
 		fmt.Fprintf(w, "created setter %q\n", r.CreateSetter.Name)
 	}
diff --git a/cmd/config/internal/commands/cmdcreatesubstitution.go b/cmd/config/internal/commands/cmdcreatesubstitution.go
index ece1869c2..3532136a6 100644
--- a/cmd/config/internal/commands/cmdcreatesubstitution.go
+++ b/cmd/config/internal/commands/cmdcreatesubstitution.go
@@ -88,10 +88,9 @@ func (r *CreateSubstitutionRunner) ExecuteCmd(w io.Writer, pkgPath string) error
 		// return err if RecurseSubPackages is false
 		if !r.CreateSubstitution.RecurseSubPackages {
 			return err
-		} else {
-			// print error message and continue if RecurseSubPackages is true
-			fmt.Fprintf(w, "%s\n", err.Error())
 		}
+		// print error message and continue if RecurseSubPackages is true
+		fmt.Fprintf(w, "%s\n", err.Error())
 	} else {
 		fmt.Fprintf(w, "created substitution %q\n", r.CreateSubstitution.Name)
 	}
diff --git a/cmd/config/internal/commands/cmddeletesetter.go b/cmd/config/internal/commands/cmddeletesetter.go
index fbea3cf8c..222c1557a 100644
--- a/cmd/config/internal/commands/cmddeletesetter.go
+++ b/cmd/config/internal/commands/cmddeletesetter.go
@@ -92,10 +92,9 @@ func (r *DeleteSetterRunner) ExecuteCmd(w io.Writer, pkgPath string) error {
 		// return err if RecurseSubPackages is false
 		if !r.DeleteSetter.RecurseSubPackages {
 			return err
-		} else {
-			// print error message and continue if RecurseSubPackages is true
-			fmt.Fprintf(w, "%s\n", err.Error())
 		}
+		// print error message and continue if RecurseSubPackages is true
+		fmt.Fprintf(w, "%s\n", err.Error())
 	} else {
 		fmt.Fprintf(w, "deleted setter %q\n", r.DeleteSetter.Name)
 	}
diff --git a/cmd/config/internal/commands/cmddeletesubstitution.go b/cmd/config/internal/commands/cmddeletesubstitution.go
index a48bf40f9..3ea178d65 100644
--- a/cmd/config/internal/commands/cmddeletesubstitution.go
+++ b/cmd/config/internal/commands/cmddeletesubstitution.go
@@ -88,10 +88,9 @@ func (r *DeleteSubstitutionRunner) ExecuteCmd(w io.Writer, pkgPath string) error
 		// return err if RecurseSubPackages is false
 		if !r.DeleteSubstitution.RecurseSubPackages {
 			return err
-		} else {
-			// print error message and continue if RecurseSubPackages is true
-			fmt.Fprintf(w, "%s\n", err.Error())
 		}
+		// print error message and continue if RecurseSubPackages is true
+		fmt.Fprintf(w, "%s\n", err.Error())
 	} else {
 		fmt.Fprintf(w, "deleted substitution %q\n", r.DeleteSubstitution.Name)
 	}
diff --git a/cmd/config/internal/commands/cmdset.go b/cmd/config/internal/commands/cmdset.go
index c7a3bee64..90c834d4d 100644
--- a/cmd/config/internal/commands/cmdset.go
+++ b/cmd/config/internal/commands/cmdset.go
@@ -128,10 +128,9 @@ func (r *SetRunner) ExecuteCmd(w io.Writer, pkgPath string) error {
 		// return err if RecurseSubPackages is false
 		if !r.Set.RecurseSubPackages {
 			return err
-		} else {
-			// print error message and continue if RecurseSubPackages is true
-			fmt.Fprintf(w, "%s\n", err.Error())
 		}
+		// print error message and continue if RecurseSubPackages is true
+		fmt.Fprintf(w, "%s\n", err.Error())
 	} else {
 		fmt.Fprintf(w, "set %d field(s) of setter %q to value %q\n", count, r.Set.Name, r.Set.Value)
 	}
diff --git a/cmd/config/internal/commands/count.go b/cmd/config/internal/commands/count.go
index dc7fceafd..10a1d1e59 100644
--- a/cmd/config/internal/commands/count.go
+++ b/cmd/config/internal/commands/count.go
@@ -81,10 +81,9 @@ func (r *CountRunner) ExecuteCmd(w io.Writer, pkgPath string) error {
 		// return err if there is only package
 		if !r.RecurseSubPackages {
 			return err
-		} else {
-			// print error message and continue if there are multiple packages to annotate
-			fmt.Fprintf(w, "%s\n", err.Error())
 		}
+		// print error message and continue if there are multiple packages to annotate
+		fmt.Fprintf(w, "%s\n", err.Error())
 	}
 	return nil
 }
diff --git a/cmd/config/internal/commands/fmt.go b/cmd/config/internal/commands/fmt.go
index f1c1323ad..c820332b7 100644
--- a/cmd/config/internal/commands/fmt.go
+++ b/cmd/config/internal/commands/fmt.go
@@ -108,10 +108,9 @@ func (r *FmtRunner) ExecuteCmd(w io.Writer, pkgPath string) error {
 		// return err if RecurseSubPackages is false
 		if !r.RecurseSubPackages {
 			return err
-		} else {
-			// print error message and continue if RecurseSubPackages is true
-			fmt.Fprintf(w, "%s\n", err.Error())
 		}
+		// print error message and continue if RecurseSubPackages is true
+		fmt.Fprintf(w, "%s\n", err.Error())
 	} else {
 		fmt.Fprint(w, "formatted resource files in the package\n")
 	}
diff --git a/cmd/config/internal/commands/grep.go b/cmd/config/internal/commands/grep.go
index 15d12b96a..6333a280e 100644
--- a/cmd/config/internal/commands/grep.go
+++ b/cmd/config/internal/commands/grep.go
@@ -155,10 +155,9 @@ func (r *GrepRunner) ExecuteCmd(w io.Writer, pkgPath string) error {
 		// return err if there is only package
 		if !r.RecurseSubPackages {
 			return err
-		} else {
-			// print error message and continue if there are multiple packages to annotate
-			fmt.Fprintf(w, "%s\n", err.Error())
 		}
+		// print error message and continue if there are multiple packages to annotate
+		fmt.Fprintf(w, "%s\n", err.Error())
 	}
 	fmt.Fprint(w, out.String())
 	if out.String() != "" {
diff --git a/plugin/builtin/patchtransformer/PatchTransformer.go b/plugin/builtin/patchtransformer/PatchTransformer.go
index 1e2612872..0e254a7c6 100644
--- a/plugin/builtin/patchtransformer/PatchTransformer.go
+++ b/plugin/builtin/patchtransformer/PatchTransformer.go
@@ -80,10 +80,9 @@ func (p *plugin) Config(
 func (p *plugin) Transform(m resmap.ResMap) error {
 	if p.loadedPatch == nil {
 		return p.transformJson6902(m, p.decodedPatch)
-	} else {
-		// The patch was a strategic merge patch
-		return p.transformStrategicMerge(m, p.loadedPatch)
 	}
+	// The patch was a strategic merge patch
+	return p.transformStrategicMerge(m, p.loadedPatch)
 }
 
 // transformStrategicMerge applies the provided strategic merge patch