diff --git a/bridge_test.go b/bridge_test.go
index 57e53b9..ec3f676 100644
--- a/bridge_test.go
+++ b/bridge_test.go
@@ -572,7 +572,7 @@ func TestHandlePacket(t *testing.T) {
 			le := len(events)
 			// Flatten actual events.
 			actual := event.Events{}
-			for i := 0; i < le; i++ {
+			for j := 0; j < le; j++ {
 				actual = append(actual, <-events...)
 			}
 
diff --git a/main.go b/main.go
index 5c08780..4dfa14b 100644
--- a/main.go
+++ b/main.go
@@ -492,7 +492,6 @@ func main() {
 				}
 			}
 		}
-
 	}
 
 	mux := http.NewServeMux()
diff --git a/pkg/event/event_test.go b/pkg/event/event_test.go
index d458ca5..192ce29 100644
--- a/pkg/event/event_test.go
+++ b/pkg/event/event_test.go
@@ -84,5 +84,4 @@ func TestEventIntervalFlush(t *testing.T) {
 	if len(events) != 10 {
 		t.Fatal("Expected 10 events in the event channel, but got", len(events))
 	}
-
 }
diff --git a/pkg/exporter/exporter.go b/pkg/exporter/exporter.go
index 0ee0b36..e5a628c 100644
--- a/pkg/exporter/exporter.go
+++ b/pkg/exporter/exporter.go
@@ -55,7 +55,6 @@ type Exporter struct {
 // Listen handles all events sent to the given channel sequentially. It
 // terminates when the channel is closed.
 func (b *Exporter) Listen(e <-chan event.Events) {
-
 	removeStaleMetricsTicker := clock.NewTicker(time.Second)
 
 	for {
@@ -77,7 +76,6 @@ func (b *Exporter) Listen(e <-chan event.Events) {
 
 // handleEvent processes a single Event according to the configured mapping.
 func (b *Exporter) handleEvent(thisEvent event.Event) {
-
 	mapping, labels, present := b.Mapper.GetMapping(thisEvent.MetricName(), thisEvent.MetricType())
 	if mapping == nil {
 		mapping = &mapper.MetricMapping{}
diff --git a/pkg/mapper/mapper.go b/pkg/mapper/mapper.go
index 8666a6f..302a61f 100644
--- a/pkg/mapper/mapper.go
+++ b/pkg/mapper/mapper.go
@@ -144,7 +144,6 @@ func (m *MetricMapper) InitFromYAMLString(fileContents string) error {
 			}
 			currentMapping.labelFormatters = labelFormatters
 			currentMapping.labelKeys = labelKeys
-
 		} else {
 			if regex, err := regexp.Compile(currentMapping.Match); err != nil {
 				return fmt.Errorf("invalid regex %s in mapping: %v", currentMapping.Match, err)
@@ -222,7 +221,6 @@ func (m *MetricMapper) InitFromYAMLString(fileContents string) error {
 		if currentMapping.Ttl == 0 && n.Defaults.Ttl > 0 {
 			currentMapping.Ttl = n.Defaults.Ttl
 		}
-
 	}
 
 	m.mutex.Lock()
diff --git a/pkg/mapper/mapper_cache.go b/pkg/mapper/mapper_cache.go
index 4f9ef2b..4d98e75 100644
--- a/pkg/mapper/mapper_cache.go
+++ b/pkg/mapper/mapper_cache.go
@@ -79,9 +79,7 @@ func (m *MetricMapperNoopCache) Get(metricKey string) (interface{}, bool) {
 	return nil, false
 }
 
-func (m *MetricMapperNoopCache) Add(metricKey string, result interface{}) {
-	return
-}
+func (m *MetricMapperNoopCache) Add(metricKey string, result interface{}) {}
 
 func (m *MetricMapperNoopCache) Reset() {}