diff --git a/nameserver/addrs.go b/nameserver/addrs.go
index cdceb385..8abc1d33 100644
--- a/nameserver/addrs.go
+++ b/nameserver/addrs.go
@@ -87,7 +87,7 @@ func addrToIPv4(addr string) (IPv4, error) {
 // Parse a reverse address (eg, "11.12.13.10.in-addr.arpa.") and return the corresponding IPv4 (eg, "10.13.12.11")
 func raddrToIPv4(addr string) (IPv4, error) {
 	l := len(addr)
-	if l < rdnsDomainLen + 1 {
+	if l < rdnsDomainLen+1 {
 		return IPv4{}, &net.ParseError{"too short reverse IP address", addr}
 	}
 
diff --git a/nameserver/addrs_test.go b/nameserver/addrs_test.go
index 024551c4..d9a780af 100644
--- a/nameserver/addrs_test.go
+++ b/nameserver/addrs_test.go
@@ -1,30 +1,30 @@
 package nameserver
 
 import (
-    . "github.com/weaveworks/weave/common"
-    wt "github.com/weaveworks/weave/testing"
-    "net"
-    "testing"
+	. "github.com/weaveworks/weave/common"
+	wt "github.com/weaveworks/weave/testing"
+	"net"
+	"testing"
 )
 
 func TestAddrs(t *testing.T) {
-    InitDefaultLogging(testing.Verbose())
+	InitDefaultLogging(testing.Verbose())
 
-    ip, err := addrToIPv4("10.13.12.11")
-    wt.AssertNoErr(t, err)
-    wt.AssertTrue(t, net.ParseIP("10.13.12.11").Equal(ip.toNetIP()), "IP")
+	ip, err := addrToIPv4("10.13.12.11")
+	wt.AssertNoErr(t, err)
+	wt.AssertTrue(t, net.ParseIP("10.13.12.11").Equal(ip.toNetIP()), "IP")
 
-    ip, err = raddrToIPv4("11.12.13.10.in-addr.arpa.")
-    wt.AssertNoErr(t, err)
-    wt.AssertTrue(t, net.ParseIP("10.13.12.11").Equal(ip.toNetIP()), "IP")
+	ip, err = raddrToIPv4("11.12.13.10.in-addr.arpa.")
+	wt.AssertNoErr(t, err)
+	wt.AssertTrue(t, net.ParseIP("10.13.12.11").Equal(ip.toNetIP()), "IP")
 
-    // some malformed addresses
-    ip, err = addrToIPv4("10.13.12")
-    wt.AssertTrue(t, err != nil, "when parsing malformed address")
-    ip, err = addrToIPv4("10.13.AA.12")
-    wt.AssertTrue(t, err != nil, "when parsing malformed address")
-    ip, err = raddrToIPv4("11.12.13.10.in-axxx.arpa.")
-    wt.AssertTrue(t, err != nil, "when parsing malformed address")
-    ip, err = raddrToIPv4("11.12.13.10.in-addr")
-    wt.AssertTrue(t, err != nil, "when parsing malformed address")
+	// some malformed addresses
+	ip, err = addrToIPv4("10.13.12")
+	wt.AssertTrue(t, err != nil, "when parsing malformed address")
+	ip, err = addrToIPv4("10.13.AA.12")
+	wt.AssertTrue(t, err != nil, "when parsing malformed address")
+	ip, err = raddrToIPv4("11.12.13.10.in-axxx.arpa.")
+	wt.AssertTrue(t, err != nil, "when parsing malformed address")
+	ip, err = raddrToIPv4("11.12.13.10.in-addr")
+	wt.AssertTrue(t, err != nil, "when parsing malformed address")
 }
diff --git a/nameserver/mdns_client.go b/nameserver/mdns_client.go
index 6cb11874..cffb2769 100644
--- a/nameserver/mdns_client.go
+++ b/nameserver/mdns_client.go
@@ -51,9 +51,9 @@ func (r Response) Equal(r2 *Response) bool {
 }
 
 type responseInfo struct {
-	timeout    time.Time // if no answer by this time, give up
-	insistent  bool      // insistent queries are not removed on the first reply
-	ch         chan<- *Response
+	timeout   time.Time // if no answer by this time, give up
+	insistent bool      // insistent queries are not removed on the first reply
+	ch        chan<- *Response
 }
 
 // Represents one query that we have sent for one name.
@@ -161,9 +161,9 @@ func (c *MDNSClient) SendQuery(name string, querytype uint16, insistent bool, re
 			c.inflight[name] = query
 		}
 		info := &responseInfo{
-			ch:         responseCh,
-			timeout:    time.Now().Add(mDNSTimeout),
-			insistent:  insistent,
+			ch:        responseCh,
+			timeout:   time.Now().Add(mDNSTimeout),
+			insistent: insistent,
 		}
 		// Invariant on responseInfos: they are in ascending order of
 		// timeout.  Since we use a fixed interval from Now(), this
diff --git a/nameserver/mdns_server.go b/nameserver/mdns_server.go
index 48ac9ccb..b0d8b212 100644
--- a/nameserver/mdns_server.go
+++ b/nameserver/mdns_server.go
@@ -97,7 +97,6 @@ func (s *MDNSServer) Stop() error {
 	return s.srv.Shutdown()
 }
 
-
 func (s *MDNSServer) Zone() Zone {
 	return s.zone
 }
diff --git a/nameserver/mocks_test.go b/nameserver/mocks_test.go
index aa46cc89..abe84d54 100644
--- a/nameserver/mocks_test.go
+++ b/nameserver/mocks_test.go
@@ -18,7 +18,7 @@ type mockedZone struct {
 }
 
 func NewMockedZone(zr ZoneRecord) *mockedZone { return &mockedZone{record: zr} }
-func (mz mockedZone) Domain() string         { return DefaultLocalDomain }
+func (mz mockedZone) Domain() string          { return DefaultLocalDomain }
 func (mz mockedZone) LookupName(name string) ([]ZoneRecord, error) {
 	Debug.Printf("[mocked zone]: LookupName: returning record %s", mz.record)
 	mz.NumLookupsName += 1
@@ -51,4 +51,3 @@ func (mz mockedZone) ObserveInaddr(inaddr string, observer ZoneRecordObserver) e
 	notImplWarn()
 	return nil
 }
-
diff --git a/weavedns/main.go b/weavedns/main.go
index f27ae12f..ae1e06e8 100644
--- a/weavedns/main.go
+++ b/weavedns/main.go
@@ -55,7 +55,7 @@ func main() {
 	InitDefaultLogging(debug)
 	Info.Printf("WeaveDNS version %s\n", version) // first thing in log: the version
 
-	var zone = weavedns.NewZoneDb(localDomain)
+	var zone = weavedns.NewZoneDb(domain)
 
 	if watch {
 		err := updater.Start(apiPath, zone)