diff --git a/cmd/protoc-gen-go-tetragon/eventchecker/field.go b/cmd/protoc-gen-go-tetragon/eventchecker/field.go
index 3de7c323137..b1b36d0cc11 100644
--- a/cmd/protoc-gen-go-tetragon/eventchecker/field.go
+++ b/cmd/protoc-gen-go-tetragon/eventchecker/field.go
@@ -662,10 +662,9 @@ func (field *Field) listCheckerName(g *protogen.GeneratedFile) string {
 			})
 		}
 		return ret
-	} else {
-		varIdent := field.kind().String()
-		return fmt.Sprintf("%sListMatcher", strcase.ToCamel(varIdent))
 	}
+	varIdent := field.kind().String()
+	return fmt.Sprintf("%sListMatcher", strcase.ToCamel(varIdent))
 }
 
 func (field *Field) newListCheckerName(g *protogen.GeneratedFile) string {
@@ -691,10 +690,9 @@ func (field *Field) newListCheckerName(g *protogen.GeneratedFile) string {
 			})
 		}
 		return ret
-	} else {
-		varIdent := field.kind().String()
-		return fmt.Sprintf("New%sListMatcher", strcase.ToCamel(varIdent))
 	}
+	varIdent := field.kind().String()
+	return fmt.Sprintf("New%sListMatcher", strcase.ToCamel(varIdent))
 }
 
 func (field *Field) kind() protoreflect.Kind {
diff --git a/pkg/kernels/kernels.go b/pkg/kernels/kernels.go
index 30ef077be8b..0d058fbf3a7 100644
--- a/pkg/kernels/kernels.go
+++ b/pkg/kernels/kernels.go
@@ -155,7 +155,6 @@ func GenericKprobeObjs() (string, string) {
 		return "bpf_generic_kprobe_v61.o", "bpf_generic_retkprobe_v61.o"
 	} else if EnableLargeProgs() {
 		return "bpf_generic_kprobe_v53.o", "bpf_generic_retkprobe_v53.o"
-	} else {
-		return "bpf_generic_kprobe.o", "bpf_generic_retkprobe.o"
 	}
+	return "bpf_generic_kprobe.o", "bpf_generic_retkprobe.o"
 }
diff --git a/pkg/sensors/base/base.go b/pkg/sensors/base/base.go
index 390632eb5b7..6987bfe06ad 100644
--- a/pkg/sensors/base/base.go
+++ b/pkg/sensors/base/base.go
@@ -115,7 +115,6 @@ func ExecObj() string {
 		return "bpf_execve_event_v61.o"
 	} else if kernels.EnableLargeProgs() {
 		return "bpf_execve_event_v53.o"
-	} else {
-		return "bpf_execve_event.o"
 	}
+	return "bpf_execve_event.o"
 }
diff --git a/pkg/sensors/load.go b/pkg/sensors/load.go
index 24a5265dc0e..722fed1e945 100644
--- a/pkg/sensors/load.go
+++ b/pkg/sensors/load.go
@@ -326,13 +326,17 @@ func loadInstance(bpfDir, mapDir string, load *program.Program, version, verbose
 	} else {
 		logger.GetLogger().WithField("Program", load.Name).WithField("Type", load.Type).Info("Loading BPF program")
 	}
-	if load.Type == "tracepoint" {
+
+	switch load.Type {
+	case "tracepoint":
 		return program.LoadTracepointProgram(bpfDir, mapDir, load, verbose)
-	} else if load.Type == "raw_tracepoint" || load.Type == "raw_tp" {
+	case "raw_tracepoint", "raw_tp":
 		return program.LoadRawTracepointProgram(bpfDir, mapDir, load, verbose)
-	} else if load.Type == "cgrp_socket" {
+	case "cgrp_socket":
 		return cgroup.LoadCgroupProgram(bpfDir, mapDir, load, verbose)
-	} else if probe != nil {
+	}
+
+	if probe != nil {
 		// Registered probes need extra setup
 		return probe.LoadProbe(LoadProbeArgs{
 			BPFDir:  bpfDir,
@@ -341,9 +345,9 @@ func loadInstance(bpfDir, mapDir string, load *program.Program, version, verbose
 			Version: version,
 			Verbose: verbose,
 		})
-	} else {
-		return program.LoadKprobeProgram(bpfDir, mapDir, load, verbose)
 	}
+
+	return program.LoadKprobeProgram(bpfDir, mapDir, load, verbose)
 }
 
 func observerMinReqs() (bool, error) {
diff --git a/pkg/sensors/tracing/generickprobe.go b/pkg/sensors/tracing/generickprobe.go
index 2744d009423..dee8df0992c 100644
--- a/pkg/sensors/tracing/generickprobe.go
+++ b/pkg/sensors/tracing/generickprobe.go
@@ -155,13 +155,15 @@ var (
 )
 
 func genericKprobeTableGet(id idtable.EntryID) (*genericKprobe, error) {
-	if entry, err := genericKprobeTable.GetEntry(id); err != nil {
+	entry, err := genericKprobeTable.GetEntry(id)
+	if err != nil {
 		return nil, fmt.Errorf("getting entry from genericKprobeTable failed with: %w", err)
-	} else if val, ok := entry.(*genericKprobe); !ok {
+	}
+	val, ok := entry.(*genericKprobe)
+	if !ok {
 		return nil, fmt.Errorf("getting entry from genericKprobeTable failed with: got invalid type: %T (%v)", entry, entry)
-	} else {
-		return val, nil
 	}
+	return val, nil
 }
 
 var (
diff --git a/pkg/sensors/tracing/genericuprobe.go b/pkg/sensors/tracing/genericuprobe.go
index 8148a8a56ab..dd91dafe789 100644
--- a/pkg/sensors/tracing/genericuprobe.go
+++ b/pkg/sensors/tracing/genericuprobe.go
@@ -62,13 +62,15 @@ func init() {
 }
 
 func genericUprobeTableGet(id idtable.EntryID) (*genericUprobe, error) {
-	if entry, err := uprobeTable.GetEntry(id); err != nil {
+	entry, err := uprobeTable.GetEntry(id)
+	if err != nil {
 		return nil, fmt.Errorf("getting entry from uprobeTable failed with: %w", err)
-	} else if val, ok := entry.(*genericUprobe); !ok {
+	}
+	val, ok := entry.(*genericUprobe)
+	if !ok {
 		return nil, fmt.Errorf("getting entry from uprobeTable failed with: got invalid type: %T (%v)", entry, entry)
-	} else {
-		return val, nil
 	}
+	return val, nil
 }
 
 func handleGenericUprobe(r *bytes.Reader) ([]observer.Event, error) {