diff --git a/.golangci.yml b/.golangci.yml
index bf6de9ae5..36cffd415 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -78,7 +78,8 @@ linters:
         - name: increment-decrement
 
         - name: indent-error-flow
-          disabled: true
+          arguments:
+            - "preserveScope"
 
         - name: range
 
diff --git a/plugin/file/zone.go b/plugin/file/zone.go
index 29b903f1d..9bcf4cc42 100644
--- a/plugin/file/zone.go
+++ b/plugin/file/zone.go
@@ -175,20 +175,19 @@ func (z *Zone) nameFromRight(qname string, i int) (string, bool) {
 
 	n := len(qname)
 	for j := 1; j <= z.origLen; j++ {
-		if m, shot := dns.PrevLabel(qname[:n], 1); shot {
+		m, shot := dns.PrevLabel(qname[:n], 1)
+		if shot {
 			return qname, shot
-		} else {
-			n = m
 		}
+		n = m
 	}
 
 	for j := 1; j <= i; j++ {
 		m, shot := dns.PrevLabel(qname[:n], 1)
 		if shot {
 			return qname, shot
-		} else {
-			n = m
 		}
+		n = m
 	}
 	return qname[n:], false
 }
diff --git a/plugin/kubernetes/kubernetes.go b/plugin/kubernetes/kubernetes.go
index 75436f9e6..3edbaf1b7 100644
--- a/plugin/kubernetes/kubernetes.go
+++ b/plugin/kubernetes/kubernetes.go
@@ -669,9 +669,8 @@ func (k *Kubernetes) findMultiClusterServices(r recordRequest, zone string) (ser
 func (k *Kubernetes) Serial(state request.Request) uint32 {
 	if !k.isMultiClusterZone(state.Zone) {
 		return uint32(k.APIConn.Modified(ModifiedInternal)) // #nosec G115 -- Unix time to SOA serial
-	} else {
-		return uint32(k.APIConn.Modified(ModifiedMultiCluster)) // #nosec G115 -- Unix time to SOA serial
 	}
+	return uint32(k.APIConn.Modified(ModifiedMultiCluster)) // #nosec G115 -- Unix time to SOA serial
 }
 
 // MinTTL returns the minimal TTL.
diff --git a/plugin/kubernetes/setup.go b/plugin/kubernetes/setup.go
index a58ac8a27..e054452c5 100644
--- a/plugin/kubernetes/setup.go
+++ b/plugin/kubernetes/setup.go
@@ -237,12 +237,11 @@ func ParseStanza(c *caddy.Controller) (*Kubernetes, error) {
 			args := c.RemainingArgs()
 			if len(args) == 0 {
 				return nil, c.ArgErr()
-			} else {
-				var err error
-				k8s.startupTimeout, err = time.ParseDuration(args[0])
-				if err != nil {
-					return nil, fmt.Errorf("failed to parse startup_timeout: %v, %s", args[0], err)
-				}
+			}
+			var err error
+			k8s.startupTimeout, err = time.ParseDuration(args[0])
+			if err != nil {
+				return nil, fmt.Errorf("failed to parse startup_timeout: %v, %s", args[0], err)
 			}
 		case "apiserver_qps":
 			args := c.RemainingArgs()