diff --git a/cmd/cnetflow/cnetflow.go b/cmd/cnetflow/cnetflow.go
index 5b5222b..f8780fc 100644
--- a/cmd/cnetflow/cnetflow.go
+++ b/cmd/cnetflow/cnetflow.go
@@ -3,16 +3,14 @@ package main
 import (
 	"flag"
 	"fmt"
+	"net/http"
 	"os"
 	"runtime"
 
 	"github.com/cloudflare/goflow/v3/transport"
 	"github.com/cloudflare/goflow/v3/utils"
-	log "github.com/sirupsen/logrus"
-
-	"net/http"
-
 	"github.com/prometheus/client_golang/prometheus/promhttp"
+	log "github.com/sirupsen/logrus"
 )
 
 var (
diff --git a/cmd/cnflegacy/cnflegacy.go b/cmd/cnflegacy/cnflegacy.go
index 51b641d..722d559 100644
--- a/cmd/cnflegacy/cnflegacy.go
+++ b/cmd/cnflegacy/cnflegacy.go
@@ -3,16 +3,14 @@ package main
 import (
 	"flag"
 	"fmt"
+	"net/http"
 	"os"
 	"runtime"
 
 	"github.com/cloudflare/goflow/v3/transport"
 	"github.com/cloudflare/goflow/v3/utils"
-	log "github.com/sirupsen/logrus"
-
-	"net/http"
-
 	"github.com/prometheus/client_golang/prometheus/promhttp"
+	log "github.com/sirupsen/logrus"
 )
 
 var (
diff --git a/cmd/csflow/csflow.go b/cmd/csflow/csflow.go
index f2a2ea5..92e3e40 100644
--- a/cmd/csflow/csflow.go
+++ b/cmd/csflow/csflow.go
@@ -3,16 +3,14 @@ package main
 import (
 	"flag"
 	"fmt"
+	"net/http"
 	"os"
 	"runtime"
 
 	"github.com/cloudflare/goflow/v3/transport"
 	"github.com/cloudflare/goflow/v3/utils"
-	log "github.com/sirupsen/logrus"
-
-	"net/http"
-
 	"github.com/prometheus/client_golang/prometheus/promhttp"
+	log "github.com/sirupsen/logrus"
 )
 
 var (
diff --git a/cmd/goflow/goflow.go b/cmd/goflow/goflow.go
index 9c6e9d7..5c8afad 100644
--- a/cmd/goflow/goflow.go
+++ b/cmd/goflow/goflow.go
@@ -3,18 +3,15 @@ package main
 import (
 	"flag"
 	"fmt"
+	"net/http"
 	"os"
 	"runtime"
+	"sync"
 
 	"github.com/cloudflare/goflow/v3/transport"
 	"github.com/cloudflare/goflow/v3/utils"
-	log "github.com/sirupsen/logrus"
-
-	"net/http"
-
 	"github.com/prometheus/client_golang/prometheus/promhttp"
-
-	"sync"
+	log "github.com/sirupsen/logrus"
 )
 
 var (
diff --git a/transport/kafka.go b/transport/kafka.go
index 0dfd408..ac364b6 100644
--- a/transport/kafka.go
+++ b/transport/kafka.go
@@ -3,20 +3,17 @@ package transport
 import (
 	"crypto/tls"
 	"crypto/x509"
-	"fmt"
-	"strings"
-
-	flowmessage "github.com/cloudflare/goflow/v3/pb"
-	"github.com/cloudflare/goflow/v3/utils"
-	proto "github.com/golang/protobuf/proto"
-
-	//"github.com/golang/protobuf/descriptor"
 	"errors"
 	"flag"
+	"fmt"
 	"os"
 	"reflect"
+	"strings"
 
 	sarama "github.com/Shopify/sarama"
+	flowmessage "github.com/cloudflare/goflow/v3/pb"
+	"github.com/cloudflare/goflow/v3/utils"
+	proto "github.com/golang/protobuf/proto"
 )
 
 var (