2 files changed, 9 insertions, 10 deletions
diff --git a/internal/probemanager/grouping.go b/internal/probemanager/grouping.go
index aa4f133..be55659 100644
--- a/internal/probemanager/grouping.go
+++ b/internal/probemanager/grouping.go
@@ -35,19 +35,17 @@ func GroupTracepoints(names []string) map[string]TracepointPair {
 }
 
 func parseSyscallTracepoint(name string) (base string, isEnter bool, ok bool) {
-	if strings.HasPrefix(name, sysEnterPrefix) {
-		base = strings.TrimPrefix(name, sysEnterPrefix)
-		if base == "" {
+	if after, found := strings.CutPrefix(name, sysEnterPrefix); found {
+		if after == "" {
 			return "", false, false
 		}
-		return base, true, true
+		return after, true, true
 	}
-	if strings.HasPrefix(name, sysExitPrefix) {
-		base = strings.TrimPrefix(name, sysExitPrefix)
-		if base == "" {
+	if after, found := strings.CutPrefix(name, sysExitPrefix); found {
+		if after == "" {
 			return "", false, false
 		}
-		return base, false, true
+		return after, false, true
 	}
 	return "", false, false
 }
diff --git a/internal/probemanager/manager.go b/internal/probemanager/manager.go
index 4c9dcec..cad755e 100644
--- a/internal/probemanager/manager.go
+++ b/internal/probemanager/manager.go
@@ -1,9 +1,10 @@
 package probemanager
 
 import (
+	"cmp"
 	"errors"
 	"fmt"
-	"sort"
+	"slices"
 	"strings"
 	"sync"
 )
@@ -244,7 +245,7 @@ func (m *Manager) States() []ProbeState {
 		}
 		out = append(out, state)
 	}
-	sort.Slice(out, func(i, j int) bool { return out[i].Syscall < out[j].Syscall })
+	slices.SortFunc(out, func(a, b ProbeState) int { return cmp.Compare(a.Syscall, b.Syscall) })
 	return out
 }