diff --git a/consts.go b/consts.go
index 6d4074a2..30704df6 100644
--- a/consts.go
+++ b/consts.go
@@ -10,7 +10,7 @@ const (
 	EthernetOverhead  = 14
 	UDPOverhead       = 28 // 20 bytes for IPv4, 8 bytes for UDP
 	Port              = 6783
-	StatusPort        = Port+1
+	StatusPort        = Port + 1
 	DefaultPMTU       = 65535
 	MaxUDPPacketSize  = 65536
 	ChannelSize       = 16
diff --git a/http_responder.go b/http_responder.go
index bf2ff05c..29cfd299 100644
--- a/http_responder.go
+++ b/http_responder.go
@@ -2,33 +2,33 @@ package weave
 
 import (
 	"fmt"
-    "net/http"
+	"net/http"
 )
 
 /* A simple http responder that will show the status of the router when asked,
- e.g. via http://172.17.0.2/status
+e.g. via http://172.17.0.2/status
 */
 type HttpStatusResponder struct {
-    router *Router
+	router *Router
 }
 
 func NewHttpStatusResponder(router *Router) *HttpStatusResponder {
-    resp := &HttpStatusResponder{router}
-    return resp
+	resp := &HttpStatusResponder{router}
+	return resp
 }
 
 func (resp *HttpStatusResponder) SetRouter(newRouter *Router) {
-    resp.router = newRouter
+	resp.router = newRouter
 }
 
 func (resp *HttpStatusResponder) ListenAndServe() {
-    http.HandleFunc("/status", func(w http.ResponseWriter, r *http.Request) {
-        if resp.router != nil {
-            fmt.Fprint(w, resp.router.Status())
-        } else {
-            fmt.Fprintf(w, "Not initialized")
-        }
-    })
-    address := fmt.Sprintf(":%d", StatusPort)
-    http.ListenAndServe(address, nil)
+	http.HandleFunc("/status", func(w http.ResponseWriter, r *http.Request) {
+		if resp.router != nil {
+			fmt.Fprint(w, resp.router.Status())
+		} else {
+			fmt.Fprintf(w, "Not initialized")
+		}
+	})
+	address := fmt.Sprintf(":%d", StatusPort)
+	http.ListenAndServe(address, nil)
 }
diff --git a/weaver/main.go b/weaver/main.go
index 27e89912..e8c210e3 100644
--- a/weaver/main.go
+++ b/weaver/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/bboreham/weave"
+	"github.com/zettio/weave"
 	"code.google.com/p/gopacket/layers"
 	"crypto/sha256"
 	"flag"
@@ -70,7 +70,7 @@ func main() {
 	flag.IntVar(&bufSz, "bufsz", 8, "capture buffer size in MB (defaults to 8MB)")
 	flag.Parse()
 	peers = flag.Args()
-    
+
 	if ifaceName == "" {
 		fmt.Println("Missing required parameter 'iface'")
 		os.Exit(1)
@@ -123,8 +123,8 @@ func main() {
 			}
 		}()
 	}
-    httpResponder := weave.NewHttpStatusResponder(router)
-    go httpResponder.ListenAndServe()
+	httpResponder := weave.NewHttpStatusResponder(router)
+	go httpResponder.ListenAndServe()
 	handleSignals(router)
 }
 
diff --git a/weaver/weave b/weaver/weave
index a7dee039..7c71675d 100755
--- a/weaver/weave
+++ b/weaver/weave
@@ -106,7 +106,8 @@ ip netns exec $NSPID ip link set $GUEST_IFNAME name $CONTAINER_IFNAME
 ip netns exec $NSPID ip addr add $IPADDR dev $CONTAINER_IFNAME
 ip netns exec $NSPID ip link set $CONTAINER_IFNAME up
 
-if command -v ethtool >/dev/null 2>&1 ; then
+if [ command -v ethtool >/dev/null 2>&1 ]
+then
     ip netns exec $NSPID ethtool -K $IFACE tx off > /dev/null
 else
     echo "Cannot find ethtool; continuing without it" >&2