diff --git a/examples/shipping/booking/endpoint.go b/examples/shipping/booking/endpoint.go
index ac03333..b9864d2 100644
--- a/examples/shipping/booking/endpoint.go
+++ b/examples/shipping/booking/endpoint.go
@@ -3,10 +3,11 @@
 import (
 	"time"
 
+	"golang.org/x/net/context"
+
 	"github.com/go-kit/kit/endpoint"
 	"github.com/go-kit/kit/examples/shipping/cargo"
 	"github.com/go-kit/kit/examples/shipping/location"
-	"golang.org/x/net/context"
 )
 
 type bookCargoRequest struct {
diff --git a/examples/shipping/booking/logging.go b/examples/shipping/booking/logging.go
index 35e0f5a..85c74ae 100644
--- a/examples/shipping/booking/logging.go
+++ b/examples/shipping/booking/logging.go
@@ -3,10 +3,9 @@
 import (
 	"time"
 
-	"github.com/go-kit/kit/log"
-
 	"github.com/go-kit/kit/examples/shipping/cargo"
 	"github.com/go-kit/kit/examples/shipping/location"
+	"github.com/go-kit/kit/log"
 )
 
 type loggingService struct {
diff --git a/examples/shipping/booking/transport.go b/examples/shipping/booking/transport.go
index b9b2cdb..f296698 100644
--- a/examples/shipping/booking/transport.go
+++ b/examples/shipping/booking/transport.go
@@ -6,13 +6,13 @@
 	"net/http"
 	"time"
 
+	"github.com/gorilla/mux"
+	"golang.org/x/net/context"
+
+	"github.com/go-kit/kit/examples/shipping/cargo"
+	"github.com/go-kit/kit/examples/shipping/location"
 	kitlog "github.com/go-kit/kit/log"
 	kithttp "github.com/go-kit/kit/transport/http"
-	"golang.org/x/net/context"
-
-	"github.com/gorilla/mux"
-	"github.com/go-kit/kit/examples/shipping/cargo"
-	"github.com/go-kit/kit/examples/shipping/location"
 )
 
 // MakeHandler returns a handler for the booking service.
diff --git a/examples/shipping/handling/endpoint.go b/examples/shipping/handling/endpoint.go
index 42614f9..e10bdda 100644
--- a/examples/shipping/handling/endpoint.go
+++ b/examples/shipping/handling/endpoint.go
@@ -3,11 +3,12 @@
 import (
 	"time"
 
+	"golang.org/x/net/context"
+
 	"github.com/go-kit/kit/endpoint"
 	"github.com/go-kit/kit/examples/shipping/cargo"
 	"github.com/go-kit/kit/examples/shipping/location"
 	"github.com/go-kit/kit/examples/shipping/voyage"
-	"golang.org/x/net/context"
 )
 
 type registerIncidentRequest struct {
diff --git a/examples/shipping/handling/logging.go b/examples/shipping/handling/logging.go
index 28290d7..50af517 100644
--- a/examples/shipping/handling/logging.go
+++ b/examples/shipping/handling/logging.go
@@ -3,11 +3,10 @@
 import (
 	"time"
 
-	"github.com/go-kit/kit/log"
-
 	"github.com/go-kit/kit/examples/shipping/cargo"
 	"github.com/go-kit/kit/examples/shipping/location"
 	"github.com/go-kit/kit/examples/shipping/voyage"
+	"github.com/go-kit/kit/log"
 )
 
 type loggingService struct {
diff --git a/examples/shipping/handling/transport.go b/examples/shipping/handling/transport.go
index 4a28c3e..18efa81 100644
--- a/examples/shipping/handling/transport.go
+++ b/examples/shipping/handling/transport.go
@@ -5,15 +5,14 @@
 	"net/http"
 	"time"
 
+	"github.com/gorilla/mux"
 	"golang.org/x/net/context"
 
-	kitlog "github.com/go-kit/kit/log"
-	kithttp "github.com/go-kit/kit/transport/http"
-
-	"github.com/gorilla/mux"
 	"github.com/go-kit/kit/examples/shipping/cargo"
 	"github.com/go-kit/kit/examples/shipping/location"
 	"github.com/go-kit/kit/examples/shipping/voyage"
+	kitlog "github.com/go-kit/kit/log"
+	kithttp "github.com/go-kit/kit/transport/http"
 )
 
 // MakeHandler returns a handler for the handling service.
diff --git a/examples/shipping/routing/proxying.go b/examples/shipping/routing/proxying.go
index e5baae8..4365669 100644
--- a/examples/shipping/routing/proxying.go
+++ b/examples/shipping/routing/proxying.go
@@ -6,13 +6,13 @@
 	"net/url"
 	"time"
 
+	"golang.org/x/net/context"
+
 	"github.com/go-kit/kit/circuitbreaker"
 	"github.com/go-kit/kit/endpoint"
 	"github.com/go-kit/kit/examples/shipping/cargo"
 	"github.com/go-kit/kit/examples/shipping/location"
 	"github.com/go-kit/kit/examples/shipping/voyage"
-	"golang.org/x/net/context"
-
 	kithttp "github.com/go-kit/kit/transport/http"
 )
 
diff --git a/examples/shipping/tracking/endpoint.go b/examples/shipping/tracking/endpoint.go
index a159449..ea105d5 100644
--- a/examples/shipping/tracking/endpoint.go
+++ b/examples/shipping/tracking/endpoint.go
@@ -1,8 +1,9 @@
 package tracking
 
 import (
+	"golang.org/x/net/context"
+
 	"github.com/go-kit/kit/endpoint"
-	"golang.org/x/net/context"
 )
 
 type trackCargoRequest struct {
diff --git a/examples/shipping/tracking/transport.go b/examples/shipping/tracking/transport.go
index 3ae429e..1d04f6c 100644
--- a/examples/shipping/tracking/transport.go
+++ b/examples/shipping/tracking/transport.go
@@ -5,12 +5,12 @@
 	"errors"
 	"net/http"
 
+	"github.com/gorilla/mux"
 	"golang.org/x/net/context"
 
+	"github.com/go-kit/kit/examples/shipping/cargo"
 	kitlog "github.com/go-kit/kit/log"
 	kithttp "github.com/go-kit/kit/transport/http"
-	"github.com/gorilla/mux"
-	"github.com/go-kit/kit/examples/shipping/cargo"
 )
 
 // MakeHandler returns a handler for the tracking service.