diff --git a/cmd/chihaya/main.go b/cmd/chihaya/main.go
index 08f4569..69277bd 100644
--- a/cmd/chihaya/main.go
+++ b/cmd/chihaya/main.go
@@ -15,11 +15,14 @@ import (
 	"github.com/chihaya/chihaya/server"
 	"github.com/chihaya/chihaya/tracker"
 
-	_ "github.com/chihaya/chihaya/middleware/deniability"
+	// Servers
 	_ "github.com/chihaya/chihaya/server/http"
 	_ "github.com/chihaya/chihaya/server/prometheus"
 	_ "github.com/chihaya/chihaya/server/store"
 	_ "github.com/chihaya/chihaya/server/store/memory"
+
+	// Middleware
+	_ "github.com/chihaya/chihaya/middleware/deniability"
 	_ "github.com/chihaya/chihaya/server/store/middleware/client"
 	_ "github.com/chihaya/chihaya/server/store/middleware/infohash"
 	_ "github.com/chihaya/chihaya/server/store/middleware/ip"