diff --git a/apps/carrier-connector/internal/integration/carrier_config.go b/apps/carrier-connector/internal/integration/carrier_config.go
index 65fbd57..50c66b7 100644
--- a/apps/carrier-connector/internal/integration/carrier_config.go
+++ b/apps/carrier-connector/internal/integration/carrier_config.go
@@ -109,7 +109,7 @@ func (r *GormCarrierRepository) SaveCarrier(ctx context.Context, carrier *smdp.C
 // UpdateCarrierMetrics updates carrier metrics
 func (r *GormCarrierRepository) UpdateCarrierMetrics(ctx context.Context, id string, metrics *smdp.CarrierMetrics) error {
 	// Persist metrics alongside the carrier record
-	updates := map[string]interface{}{
+	updates := map[string]any{
 		"updated_at": time.Now(),
 	}
 
diff --git a/apps/carrier-connector/internal/services/pricing_integration.go b/apps/carrier-connector/internal/services/pricing_integration.go
index b9b4a0d..aa9a9bf 100644
--- a/apps/carrier-connector/internal/services/pricing_integration.go
+++ b/apps/carrier-connector/internal/services/pricing_integration.go
@@ -227,7 +227,7 @@ type PricingEffectiveness struct {
 	TotalSavings          float64        `json:"total_savings"`
 	RulesByType           map[string]int `json:"rules_by_type"`
 	ConversionImprovement float64        `json:"conversion_improvement"`
-	GeneratedAt           interface{}    `json:"generated_at"`
+	GeneratedAt           any            `json:"generated_at"`
 }
 
 type RatePlanPricingAnalytics struct {
diff --git a/apps/carrier-connector/internal/services/pricing_validator.go b/apps/carrier-connector/internal/services/pricing_validator.go
index a70d204..20cfddc 100644
--- a/apps/carrier-connector/internal/services/pricing_validator.go
+++ b/apps/carrier-connector/internal/services/pricing_validator.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"slices"
 
 	"github.com/nutcas3/telecom-platform/apps/carrier-connector/internal/pricing"
 )
@@ -121,17 +122,13 @@ func (v *PricingValidator) ValidateConditions(ctx context.Context, conditions pr
 	}
 
 	// Validate geography
-	for _, geo := range conditions.Geography {
-		if geo == "" {
-			return errors.New("geography cannot be empty")
-		}
+	if slices.Contains(conditions.Geography, "") {
+		return errors.New("geography cannot be empty")
 	}
 
 	// Validate customer type
-	for _, ct := range conditions.CustomerType {
-		if ct == "" {
-			return errors.New("customer type cannot be empty")
-		}
+	if slices.Contains(conditions.CustomerType, "") {
+		return errors.New("customer type cannot be empty")
 	}
 
 	// Validate volume range
diff --git a/apps/carrier-connector/internal/services/tenant_analytics_methods.go b/apps/carrier-connector/internal/services/tenant_analytics_methods.go
index 3df0a63..618ca1e 100644
--- a/apps/carrier-connector/internal/services/tenant_analytics_methods.go
+++ b/apps/carrier-connector/internal/services/tenant_analytics_methods.go
@@ -95,7 +95,7 @@ func (s *TenantServiceImpl) calculateAPIPerformance(requests []*tenant.APIReques
 	copy(sortedResponseTimes, responseTimes)
 
 	// Sort response times
-	for i := 0; i < len(sortedResponseTimes); i++ {
+	for i := range sortedResponseTimes {
 		for j := 0; j < len(sortedResponseTimes)-1-i; j++ {
 			if sortedResponseTimes[j] > sortedResponseTimes[j+1] {
 				sortedResponseTimes[j], sortedResponseTimes[j+1] = sortedResponseTimes[j+1], sortedResponseTimes[j]