diff --git a/internal/cli/atlas/networking/peering/create/azure.go b/internal/cli/atlas/networking/peering/create/azure.go
index 844a3191b5..79ebfee33d 100644
--- a/internal/cli/atlas/networking/peering/create/azure.go
+++ b/internal/cli/atlas/networking/peering/create/azure.go
@@ -103,7 +103,7 @@ func (opts *AzureOpts) newContainer() *atlasv2.CloudProviderContainer {
 }
 
 func (opts *AzureOpts) newPeer(containerID string) *atlasv2.BaseNetworkPeeringConnectionSettings {
-	return opts.newAzurePeer((containerID))
+	return opts.newAzurePeer(containerID)
 }
 
 func (opts *AzureOpts) newAzurePeer(containerID string) *atlasv2.BaseNetworkPeeringConnectionSettings {
diff --git a/internal/kubernetes/operator/secrets/secrets.go b/internal/kubernetes/operator/secrets/secrets.go
index a32fee3bd5..ffd030b47a 100644
--- a/internal/kubernetes/operator/secrets/secrets.go
+++ b/internal/kubernetes/operator/secrets/secrets.go
@@ -36,7 +36,7 @@ const (
 type AtlasSecretBuilder func() (*corev1.Secret, map[string]string)
 
 func NewAtlasSecretBuilder(name, namespace string, dictionary map[string]string) AtlasSecretBuilder {
-	return AtlasSecretBuilder(func() (*corev1.Secret, map[string]string) {
+	return func() (*corev1.Secret, map[string]string) {
 		secret := &corev1.Secret{
 			TypeMeta: v1.TypeMeta{
 				Kind:       "Secret",
@@ -51,28 +51,28 @@ func NewAtlasSecretBuilder(name, namespace string, dictionary map[string]string)
 			},
 		}
 		return secret, dictionary
-	})
+	}
 }
 
 func (a AtlasSecretBuilder) WithData(data map[string][]byte) AtlasSecretBuilder {
-	return AtlasSecretBuilder(func() (*corev1.Secret, map[string]string) {
+	return func() (*corev1.Secret, map[string]string) {
 		s, d := a()
 		s.Data = data
 		return s, d
-	})
+	}
 }
 
 func (a AtlasSecretBuilder) WithProjectLabels(id, name string) AtlasSecretBuilder {
-	return AtlasSecretBuilder(func() (*corev1.Secret, map[string]string) {
+	return func() (*corev1.Secret, map[string]string) {
 		s, d := a()
 		s.Labels[ProjectIDLabelKey] = resources.NormalizeAtlasName(id, d)
 		s.Labels[ProjectNameLabelKey] = resources.NormalizeAtlasName(name, d)
 		return s, d
-	})
+	}
 }
 
 func (a AtlasSecretBuilder) WithNotifierLabels(id *string, typeName string) AtlasSecretBuilder {
-	return AtlasSecretBuilder(func() (*corev1.Secret, map[string]string) {
+	return func() (*corev1.Secret, map[string]string) {
 		s, d := a()
 		if id == nil {
 			return s, d
@@ -80,7 +80,7 @@ func (a AtlasSecretBuilder) WithNotifierLabels(id *string, typeName string) Atla
 		s.Labels[NotifierIDLabelKey] = resources.NormalizeAtlasName(*id, d)
 		s.Labels[NotifierNameLabelKey] = typeName // don't normalize type name, as it is already a short form
 		return s, d
-	})
+	}
 }
 
 func (a AtlasSecretBuilder) Build() *corev1.Secret {
diff --git a/tools/templates-checker/templateparsing/templateparsing.go b/tools/templates-checker/templateparsing/templateparsing.go
index 7d583a6de4..2e3988cbc3 100644
--- a/tools/templates-checker/templateparsing/templateparsing.go
+++ b/tools/templates-checker/templateparsing/templateparsing.go
@@ -340,9 +340,9 @@ func pipelineToIdentifiers(pipeline *parse.PipeNode) ([]string, error) {
 	}
 
 	switch arg := arg.(type) {
-	case (*parse.DotNode):
+	case *parse.DotNode:
 		return make([]string, 0), nil
-	case (*parse.FieldNode):
+	case *parse.FieldNode:
 		return arg.Ident, nil
 	default:
 		return nil, errors.New("unsupported node type")
diff --git a/tools/templates-checker/templateparsing/validation.go b/tools/templates-checker/templateparsing/validation.go
index b84e8cb907..4f5f3ce7cd 100644
--- a/tools/templates-checker/templateparsing/validation.go
+++ b/tools/templates-checker/templateparsing/validation.go
@@ -65,15 +65,15 @@ func (c *TemplateCallTree) Validate(pkg *packages.Package, typeInfo types.Type)
 
 func (c *TemplateCallTree) validateInner(pkg *packages.Package, result *ValidationResult, breadCrumb string, typeInfo types.Type) error {
 	switch typeInfo := typeInfo.(type) {
-	case (*types.Basic):
+	case *types.Basic:
 		return c.validateBasic(result, breadCrumb)
-	case (*types.Map):
+	case *types.Map:
 		return c.validateMap(pkg, result, breadCrumb, typeInfo)
-	case (*types.Named):
+	case *types.Named:
 		return c.validateStruct(pkg, result, breadCrumb, typeInfo)
-	case (*types.Pointer):
+	case *types.Pointer:
 		return c.validateInner(pkg, result, breadCrumb, typeInfo.Elem())
-	case (*types.Slice):
+	case *types.Slice:
 		return c.validateSlice(pkg, result, breadCrumb, typeInfo)
 
 	default: