diff --git a/cmd/crowdsec-cli/metrics.go b/cmd/crowdsec-cli/metrics.go
index 208757da02d..0febf814b31 100644
--- a/cmd/crowdsec-cli/metrics.go
+++ b/cmd/crowdsec-cli/metrics.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -42,8 +43,10 @@ type (
 	}
 )
 
+var ErrMissingConfig = errors.New("prometheus section missing, can't show metrics")
+
 type metricSection interface {
-	Table(io.Writer, bool, bool)
+	Table(out io.Writer, noUnit bool, showEmpty bool)
 	Description() (string, string)
 }
 
@@ -165,6 +168,7 @@ func (ms metricStore) Fetch(url string) error {
 			}
 
 			ival := int(fval)
+
 			switch fam.Name {
 			//
 			// buckets
@@ -226,7 +230,7 @@ func (ms metricStore) Fetch(url string) error {
 			// stash
 			//
 			case "cs_cache_size":
-				mStash.Process(name, mtype,ival)
+				mStash.Process(name, mtype, ival)
 			//
 			// appsec
 			//
@@ -282,13 +286,13 @@ func (ms metricStore) Format(out io.Writer, sections []string, formatType string
 	case "json":
 		x, err := json.MarshalIndent(want, "", " ")
 		if err != nil {
-			return fmt.Errorf("failed to marshal metrics: %v", err)
+			return fmt.Errorf("failed to marshal metrics: %w", err)
 		}
 		out.Write(x)
 	case "raw":
 		x, err := yaml.Marshal(want)
 		if err != nil {
-			return fmt.Errorf("failed to marshal metrics: %v", err)
+			return fmt.Errorf("failed to marshal metrics: %w", err)
 		}
 		out.Write(x)
 	default:
@@ -306,11 +310,11 @@ func (cli *cliMetrics) show(sections []string, url string, noUnit bool) error {
 	}
 
 	if cfg.Prometheus == nil {
-		return fmt.Errorf("prometheus section missing, can't show metrics")
+		return ErrMissingConfig
 	}
 
 	if !cfg.Prometheus.Enabled {
-		return fmt.Errorf("prometheus is not enabled, can't show metrics")
+		return ErrMissingConfig
 	}
 
 	ms := NewMetricStore()
@@ -329,6 +333,7 @@ func (cli *cliMetrics) show(sections []string, url string, noUnit bool) error {
 	if err := ms.Format(color.Output, sections, cfg.Cscli.Output, noUnit); err != nil {
 		return err
 	}
+
 	return nil
 }
 
@@ -370,6 +375,7 @@ cscli metrics list`,
 // expandAlias returns a list of sections. The input can be a list of sections or alias.
 func (cli *cliMetrics) expandSectionGroups(args []string) []string {
 	ret := []string{}
+
 	for _, section := range args {
 		switch section {
 		case "engine":
@@ -424,8 +430,8 @@ cscli metrics show acquisition parsers buckets stash -o json`,
 
 func (cli *cliMetrics) list() error {
 	type metricType struct {
-		Type        string `json:"type" yaml:"type"`
-		Title       string `json:"title" yaml:"title"`
+		Type        string `json:"type"        yaml:"type"`
+		Title       string `json:"title"       yaml:"title"`
 		Description string `json:"description" yaml:"description"`
 	}
 
@@ -477,8 +483,7 @@ func (cli *cliMetrics) newListCmd() *cobra.Command {
 		Args:              cobra.ExactArgs(0),
 		DisableAutoGenTag: true,
 		RunE: func(_ *cobra.Command, _ []string) error {
-			cli.list()
-			return nil
+			return cli.list()
 		},
 	}
 
diff --git a/cmd/crowdsec-cli/metrics_table.go b/cmd/crowdsec-cli/metrics_table.go
index d981a3b5493..da6ea3d9f1d 100644
--- a/cmd/crowdsec-cli/metrics_table.go
+++ b/cmd/crowdsec-cli/metrics_table.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"io"
 	"sort"
+	"strconv"
 
 	"github.com/aquasecurity/table"
 	log "github.com/sirupsen/logrus"
@@ -11,17 +12,21 @@ import (
 	"github.com/crowdsecurity/go-cs-lib/maptools"
 )
 
+// ErrNilTable means a nil pointer was passed instead of a table instance. This is a programming error.
+var ErrNilTable = fmt.Errorf("nil table")
+
 func lapiMetricsToTable(t *table.Table, stats map[string]map[string]map[string]int) int {
 	// stats: machine -> route -> method -> count
-
 	// sort keys to keep consistent order when printing
 	machineKeys := []string{}
 	for k := range stats {
 		machineKeys = append(machineKeys, k)
 	}
+
 	sort.Strings(machineKeys)
 
 	numRows := 0
+
 	for _, machine := range machineKeys {
 		// oneRow: route -> method -> count
 		machineRow := stats[machine]
@@ -33,53 +38,60 @@ func lapiMetricsToTable(t *table.Table, stats map[string]map[string]map[string]i
 					methodName,
 				}
 				if count != 0 {
-					row = append(row, fmt.Sprintf("%d", count))
+					row = append(row, strconv.Itoa(count))
 				} else {
 					row = append(row, "-")
 				}
+
 				t.AddRow(row...)
 				numRows++
 			}
 		}
 	}
+
 	return numRows
 }
 
 func wlMetricsToTable(t *table.Table, stats map[string]map[string]map[string]int, noUnit bool) (int, error) {
 	if t == nil {
-		return 0, fmt.Errorf("nil table")
+		return 0, ErrNilTable
 	}
 
 	numRows := 0
 
 	for _, name := range maptools.SortedKeys(stats) {
 		for _, reason := range maptools.SortedKeys(stats[name]) {
-			row := make([]string, 4)
-			row[0] = name
-			row[1] = reason
-			row[2] = "-"
-			row[3] = "-"
+			row := []string{
+				name,
+				reason,
+				"-",
+				"-",
+			}
 
 			for _, action := range maptools.SortedKeys(stats[name][reason]) {
 				value := stats[name][reason][action]
-				if action == "whitelisted" {
-					row[3] = fmt.Sprintf("%d", value)
-				} else if action == "hits" {
-					row[2] = fmt.Sprintf("%d", value)
-				} else {
+
+				switch action {
+				case "whitelisted":
+					row[3] = strconv.Itoa(value)
+				case "hits":
+					row[2] = strconv.Itoa(value)
+				default:
 					log.Debugf("unexpected counter '%s' for whitelists = %d", action, value)
 				}
 			}
+
 			t.AddRow(row...)
 			numRows++
 		}
 	}
+
 	return numRows, nil
 }
 
 func metricsToTable(t *table.Table, stats map[string]map[string]int, keys []string, noUnit bool) (int, error) {
 	if t == nil {
-		return 0, fmt.Errorf("nil table")
+		return 0, ErrNilTable
 	}
 
 	numRows := 0
@@ -89,12 +101,14 @@ func metricsToTable(t *table.Table, stats map[string]map[string]int, keys []stri
 		if !ok {
 			continue
 		}
+
 		row := []string{
 			alabel,
 		}
+
 		for _, sl := range keys {
 			if v, ok := astats[sl]; ok && v != 0 {
-				numberToShow := fmt.Sprintf("%d", v)
+				numberToShow := strconv.Itoa(v)
 				if !noUnit {
 					numberToShow = formatNumber(v)
 				}
@@ -104,21 +118,25 @@ func metricsToTable(t *table.Table, stats map[string]map[string]int, keys []stri
 				row = append(row, "-")
 			}
 		}
+
 		t.AddRow(row...)
 		numRows++
 	}
+
 	return numRows, nil
 }
 
 func (s statBucket) Description() (string, string) {
 	return "Bucket Metrics",
-		`Measure events in different scenarios. Current count is the number of buckets during metrics collection. Overflows are past event-producing buckets, while Expired are the ones that didn’t receive enough events to Overflow.`
+		`Measure events in different scenarios. Current count is the number of buckets during metrics collection. ` +
+			`Overflows are past event-producing buckets, while Expired are the ones that didn’t receive enough events to Overflow.`
 }
 
 func (s statBucket) Process(bucket, metric string, val int) {
 	if _, ok := s[bucket]; !ok {
 		s[bucket] = make(map[string]int)
 	}
+
 	s[bucket][metric] += val
 }
 
@@ -141,13 +159,17 @@ func (s statBucket) Table(out io.Writer, noUnit bool, showEmpty bool) {
 
 func (s statAcquis) Description() (string, string) {
 	return "Acquisition Metrics",
-		`Measures the lines read, parsed, and unparsed per datasource. Zero read lines indicate a misconfigured or inactive datasource. Zero parsed lines mean the parser(s) failed. Non-zero parsed lines are fine as crowdsec selects relevant lines.`
+		`Measures the lines read, parsed, and unparsed per datasource. ` +
+			`Zero read lines indicate a misconfigured or inactive datasource. ` +
+			`Zero parsed lines mean the parser(s) failed. ` +
+			`Non-zero parsed lines are fine as crowdsec selects relevant lines.`
 }
 
 func (s statAcquis) Process(source, metric string, val int) {
 	if _, ok := s[source]; !ok {
 		s[source] = make(map[string]int)
 	}
+
 	s[source][metric] += val
 }
 
@@ -177,6 +199,7 @@ func (s statAppsecEngine) Process(appsecEngine, metric string, val int) {
 	if _, ok := s[appsecEngine]; !ok {
 		s[appsecEngine] = make(map[string]int)
 	}
+
 	s[appsecEngine][metric] += val
 }
 
@@ -185,7 +208,9 @@ func (s statAppsecEngine) Table(out io.Writer, noUnit bool, showEmpty bool) {
 	t.SetRowLines(false)
 	t.SetHeaders("Appsec Engine", "Processed", "Blocked")
 	t.SetAlignment(table.AlignLeft, table.AlignLeft)
+
 	keys := []string{"processed", "blocked"}
+
 	if numRows, err := metricsToTable(t, s, keys, noUnit); err != nil {
 		log.Warningf("while collecting appsec stats: %s", err)
 	} else if numRows > 0 || showEmpty {
@@ -204,9 +229,11 @@ func (s statAppsecRule) Process(appsecEngine, appsecRule string, metric string,
 	if _, ok := s[appsecEngine]; !ok {
 		s[appsecEngine] = make(map[string]map[string]int)
 	}
+
 	if _, ok := s[appsecEngine][appsecRule]; !ok {
 		s[appsecEngine][appsecRule] = make(map[string]int)
 	}
+
 	s[appsecEngine][appsecRule][metric] += val
 }
 
@@ -216,7 +243,9 @@ func (s statAppsecRule) Table(out io.Writer, noUnit bool, showEmpty bool) {
 		t.SetRowLines(false)
 		t.SetHeaders("Rule ID", "Triggered")
 		t.SetAlignment(table.AlignLeft, table.AlignLeft)
+
 		keys := []string{"triggered"}
+
 		if numRows, err := metricsToTable(t, appsecEngineRulesStats, keys, noUnit); err != nil {
 			log.Warningf("while collecting appsec rules stats: %s", err)
 		} else if numRows > 0 || showEmpty {
@@ -224,7 +253,6 @@ func (s statAppsecRule) Table(out io.Writer, noUnit bool, showEmpty bool) {
 			t.Render()
 		}
 	}
-
 }
 
 func (s statWhitelist) Description() (string, string) {
@@ -236,9 +264,11 @@ func (s statWhitelist) Process(whitelist, reason, metric string, val int) {
 	if _, ok := s[whitelist]; !ok {
 		s[whitelist] = make(map[string]map[string]int)
 	}
+
 	if _, ok := s[whitelist][reason]; !ok {
 		s[whitelist][reason] = make(map[string]int)
 	}
+
 	s[whitelist][reason][metric] += val
 }
 
@@ -259,13 +289,16 @@ func (s statWhitelist) Table(out io.Writer, noUnit bool, showEmpty bool) {
 
 func (s statParser) Description() (string, string) {
 	return "Parser Metrics",
-		`Tracks the number of events processed by each parser and indicates success of failure. Zero parsed lines means the parer(s) failed. Non-zero unparsed lines are fine as crowdsec select relevant lines.`
+		`Tracks the number of events processed by each parser and indicates success of failure. ` +
+			`Zero parsed lines means the parer(s) failed. ` +
+			`Non-zero unparsed lines are fine as crowdsec select relevant lines.`
 }
 
 func (s statParser) Process(parser, metric string, val int) {
 	if _, ok := s[parser]; !ok {
 		s[parser] = make(map[string]int)
 	}
+
 	s[parser][metric] += val
 }
 
@@ -316,11 +349,12 @@ func (s statStash) Table(out io.Writer, noUnit bool, showEmpty bool) {
 		row := []string{
 			alabel,
 			astats.Type,
-			fmt.Sprintf("%d", astats.Count),
+			strconv.Itoa(astats.Count),
 		}
 		t.AddRow(row...)
 		numRows++
 	}
+
 	if numRows > 0 || showEmpty {
 		title, _ := s.Description()
 		renderTableTitle(out, "\n"+title+":")
@@ -337,6 +371,7 @@ func (s statLapi) Process(route, method string, val int) {
 	if _, ok := s[route]; !ok {
 		s[route] = make(map[string]int)
 	}
+
 	s[route][method] += val
 }
 
@@ -356,13 +391,14 @@ func (s statLapi) Table(out io.Writer, noUnit bool, showEmpty bool) {
 		for skey := range astats {
 			subKeys = append(subKeys, skey)
 		}
+
 		sort.Strings(subKeys)
 
 		for _, sl := range subKeys {
 			row := []string{
 				alabel,
 				sl,
-				fmt.Sprintf("%d", astats[sl]),
+				strconv.Itoa(astats[sl]),
 			}
 			t.AddRow(row...)
 			numRows++
@@ -385,9 +421,11 @@ func (s statLapiMachine) Process(machine, route, method string, val int) {
 	if _, ok := s[machine]; !ok {
 		s[machine] = make(map[string]map[string]int)
 	}
+
 	if _, ok := s[machine][route]; !ok {
 		s[machine][route] = make(map[string]int)
 	}
+
 	s[machine][route][method] += val
 }
 
@@ -415,9 +453,11 @@ func (s statLapiBouncer) Process(bouncer, route, method string, val int) {
 	if _, ok := s[bouncer]; !ok {
 		s[bouncer] = make(map[string]map[string]int)
 	}
+
 	if _, ok := s[bouncer][route]; !ok {
 		s[bouncer][route] = make(map[string]int)
 	}
+
 	s[bouncer][route][method] += val
 }
 
@@ -448,13 +488,16 @@ func (s statLapiDecision) Process(bouncer, fam string, val int) {
 			Empty    int
 		}{}
 	}
+
 	x := s[bouncer]
+
 	switch fam {
 	case "cs_lapi_decisions_ko_total":
 		x.Empty += val
 	case "cs_lapi_decisions_ok_total":
 		x.NonEmpty += val
 	}
+
 	s[bouncer] = x
 }
 
@@ -465,11 +508,12 @@ func (s statLapiDecision) Table(out io.Writer, noUnit bool, showEmpty bool) {
 	t.SetAlignment(table.AlignLeft, table.AlignLeft, table.AlignLeft)
 
 	numRows := 0
+
 	for bouncer, hits := range s {
 		t.AddRow(
 			bouncer,
-			fmt.Sprintf("%d", hits.Empty),
-			fmt.Sprintf("%d", hits.NonEmpty),
+			strconv.Itoa(hits.Empty),
+			strconv.Itoa(hits.NonEmpty),
 		)
 		numRows++
 	}
@@ -483,16 +527,19 @@ func (s statLapiDecision) Table(out io.Writer, noUnit bool, showEmpty bool) {
 
 func (s statDecision) Description() (string, string) {
 	return "Local API Decisions",
-		`Provides information about all currently active decisions. Includes both local (crowdsec) and global decisions (CAPI), and lists subscriptions (lists).`
+		`Provides information about all currently active decisions. ` +
+			`Includes both local (crowdsec) and global decisions (CAPI), and lists subscriptions (lists).`
 }
 
 func (s statDecision) Process(reason, origin, action string, val int) {
 	if _, ok := s[reason]; !ok {
 		s[reason] = make(map[string]map[string]int)
 	}
+
 	if _, ok := s[reason][origin]; !ok {
 		s[reason][origin] = make(map[string]int)
 	}
+
 	s[reason][origin][action] += val
 }
 
@@ -503,6 +550,7 @@ func (s statDecision) Table(out io.Writer, noUnit bool, showEmpty bool) {
 	t.SetAlignment(table.AlignLeft, table.AlignLeft, table.AlignLeft, table.AlignLeft)
 
 	numRows := 0
+
 	for reason, origins := range s {
 		for origin, actions := range origins {
 			for action, hits := range actions {
@@ -510,7 +558,7 @@ func (s statDecision) Table(out io.Writer, noUnit bool, showEmpty bool) {
 					reason,
 					origin,
 					action,
-					fmt.Sprintf("%d", hits),
+					strconv.Itoa(hits),
 				)
 				numRows++
 			}
@@ -540,10 +588,11 @@ func (s statAlert) Table(out io.Writer, noUnit bool, showEmpty bool) {
 	t.SetAlignment(table.AlignLeft, table.AlignLeft)
 
 	numRows := 0
+
 	for scenario, hits := range s {
 		t.AddRow(
 			scenario,
-			fmt.Sprintf("%d", hits),
+			strconv.Itoa(hits),
 		)
 		numRows++
 	}