diff --git a/collectors/collectorManager.go b/collectors/collectorManager.go
index 2f1423e..c01356a 100644
--- a/collectors/collectorManager.go
+++ b/collectors/collectorManager.go
@@ -123,9 +123,7 @@ func (cm *collectorManager) Start() {
 	tick := make(chan time.Time)
 	cm.ticker.AddChannel(tick)
 
-	cm.wg.Add(1)
-	go func() {
-		defer cm.wg.Done()
+	cm.wg.Go(func() {
 		// Collector manager is done
 		done := func() {
 			// close all metric collectors
@@ -180,7 +178,7 @@ func (cm *collectorManager) Start() {
 				}
 			}
 		}
-	}()
+	})
 
 	// Collector manager is started
 	cclog.ComponentDebug("CollectorManager", "STARTED")
diff --git a/internal/metricRouter/metricCache.go b/internal/metricRouter/metricCache.go
index f5f9222..0a49c64 100644
--- a/internal/metricRouter/metricCache.go
+++ b/internal/metricRouter/metricCache.go
@@ -102,9 +102,7 @@ func (c *metricCache) Start() {
 		return oldPeriod
 	}
 
-	c.wg.Add(1)
-	go func() {
-		defer c.wg.Done()
+	c.wg.Go(func() {
 		for {
 			select {
 			case <-c.done:
@@ -124,7 +122,7 @@ func (c *metricCache) Start() {
 				}
 			}
 		}
-	}()
+	})
 	cclog.ComponentDebug("MetricCache", "START")
 }
 
diff --git a/internal/metricRouter/metricRouter.go b/internal/metricRouter/metricRouter.go
index 6c7398a..fc5e9ae 100644
--- a/internal/metricRouter/metricRouter.go
+++ b/internal/metricRouter/metricRouter.go
@@ -291,9 +291,7 @@ func (r *metricRouter) Start() {
 		r.cache.Start()
 	}
 
-	r.wg.Add(1)
-	go func() {
-		defer r.wg.Done()
+	r.wg.Go(func() {
 
 		for {
 			select {
@@ -324,7 +322,7 @@ func (r *metricRouter) Start() {
 				}
 			}
 		}
-	}()
+	})
 	cclog.ComponentDebug("MetricRouter", "STARTED")
 }