diff --git a/libnetwork/agent.go b/libnetwork/agent.go
index 9cf678d465..600030dd6a 100644
--- a/libnetwork/agent.go
+++ b/libnetwork/agent.go
@@ -895,7 +895,6 @@ func (c *controller) handleNodeTableEvent(ev events.Event) {
 		return
 	}
 	c.processNodeDiscovery([]net.IP{nodeAddr.Addr}, isAdd)
-
 }
 
 func (c *controller) handleEpTableEvent(ev events.Event) {
diff --git a/libnetwork/bitseq/sequence.go b/libnetwork/bitseq/sequence.go
index 0b772aeda4..8736f2cdcd 100644
--- a/libnetwork/bitseq/sequence.go
+++ b/libnetwork/bitseq/sequence.go
@@ -410,7 +410,6 @@ func (h *Handle) Destroy() error {
 
 // ToByteArray converts this handle's data into a byte array
 func (h *Handle) ToByteArray() ([]byte, error) {
-
 	h.Lock()
 	defer h.Unlock()
 	ba := make([]byte, 16)
diff --git a/libnetwork/controller.go b/libnetwork/controller.go
index 2ad5726da1..0878f1057a 100644
--- a/libnetwork/controller.go
+++ b/libnetwork/controller.go
@@ -675,7 +675,6 @@ func (c *controller) NewNetwork(networkType, name string, id string, options ...
 
 	if network.scope == datastore.LocalScope && cap.DataScope == datastore.GlobalScope {
 		return nil, types.ForbiddenErrorf("cannot downgrade network scope for %s networks", networkType)
-
 	}
 	if network.ingress && cap.DataScope != datastore.GlobalScope {
 		return nil, types.ForbiddenErrorf("Ingress network can only be global scope network")
diff --git a/libnetwork/datastore/datastore_test.go b/libnetwork/datastore/datastore_test.go
index 534940a12a..4752552b54 100644
--- a/libnetwork/datastore/datastore_test.go
+++ b/libnetwork/datastore/datastore_test.go
@@ -108,7 +108,6 @@ func TestAtomicKVObjectFlatKey(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-
 }
 
 // dummy data used to test the datastore
diff --git a/libnetwork/datastore/mock_store.go b/libnetwork/datastore/mock_store.go
index 80e43db53d..9d29d71f73 100644
--- a/libnetwork/datastore/mock_store.go
+++ b/libnetwork/datastore/mock_store.go
@@ -37,7 +37,6 @@ func (s *MockStore) Get(key string) (*store.KVPair, error) {
 		return nil, nil
 	}
 	return &store.KVPair{Value: mData.Data, LastIndex: mData.Index}, nil
-
 }
 
 // Put a value at "key"
diff --git a/libnetwork/default_gateway.go b/libnetwork/default_gateway.go
index 44431a017a..1c022a480b 100644
--- a/libnetwork/default_gateway.go
+++ b/libnetwork/default_gateway.go
@@ -30,7 +30,6 @@ var procGwNetwork = make(chan (bool), 1)
 */
 
 func (sb *sandbox) setupDefaultGW() error {
-
 	// check if the container already has a GW endpoint
 	if ep := sb.getEndpointInGWNetwork(); ep != nil {
 		return nil
diff --git a/libnetwork/drivers/bridge/bridge.go b/libnetwork/drivers/bridge/bridge.go
index 0a886fe2b4..587d65075e 100644
--- a/libnetwork/drivers/bridge/bridge.go
+++ b/libnetwork/drivers/bridge/bridge.go
@@ -802,7 +802,6 @@ func (d *driver) createNetwork(config *networkConfiguration) (err error) {
 }
 
 func (d *driver) DeleteNetwork(nid string) error {
-
 	d.configNetwork.Lock()
 	defer d.configNetwork.Unlock()
 
diff --git a/libnetwork/drivers/bridge/link.go b/libnetwork/drivers/bridge/link.go
index 7be183975a..59fa94ba20 100644
--- a/libnetwork/drivers/bridge/link.go
+++ b/libnetwork/drivers/bridge/link.go
@@ -30,7 +30,6 @@ func newLink(parentIP, childIP string, ports []types.TransportPort, bridge strin
 		ports:    ports,
 		bridge:   bridge,
 	}
-
 }
 
 func (l *link) Enable() error {
diff --git a/libnetwork/drivers/bridge/port_mapping.go b/libnetwork/drivers/bridge/port_mapping.go
index afff4b4045..e36fe8a04b 100644
--- a/libnetwork/drivers/bridge/port_mapping.go
+++ b/libnetwork/drivers/bridge/port_mapping.go
@@ -86,7 +86,7 @@ func (n *bridgeNetwork) allocatePortsInternal(bindings []types.PortBinding, cont
 // validatePortBindingIPv4 validates the port binding, populates the missing Host IP field and returns true
 // if this is a valid IPv4 binding, else returns false
 func (n *bridgeNetwork) validatePortBindingIPv4(bnd *types.PortBinding, containerIPv4, defHostIP net.IP) bool {
-	//Return early if there is a valid Host IP, but its not a IPv4 address
+	// Return early if there is a valid Host IP, but its not a IPv4 address
 	if len(bnd.HostIP) > 0 && bnd.HostIP.To4() == nil {
 		return false
 	}
@@ -100,7 +100,6 @@ func (n *bridgeNetwork) validatePortBindingIPv4(bnd *types.PortBinding, containe
 	}
 	bnd.IP = containerIPv4
 	return true
-
 }
 
 // validatePortBindingIPv6 validates the port binding, populates the missing Host IP field and returns true
diff --git a/libnetwork/drivers/bridge/setup_ip_tables.go b/libnetwork/drivers/bridge/setup_ip_tables.go
index a9d39b30ad..97caf665a2 100644
--- a/libnetwork/drivers/bridge/setup_ip_tables.go
+++ b/libnetwork/drivers/bridge/setup_ip_tables.go
@@ -390,7 +390,6 @@ func removeIPChains(version iptables.IPVersion) {
 		{Name: IsolationChain2, Table: iptables.Filter, IPTable: ipt},
 		{Name: oldIsolationChain, Table: iptables.Filter, IPTable: ipt},
 	} {
-
 		if err := chainInfo.Remove(); err != nil {
 			logrus.Warnf("Failed to remove existing iptables entries in table %s chain %s : %v", chainInfo.Table, chainInfo.Name, err)
 		}
diff --git a/libnetwork/drivers/bridge/setup_ipv6_test.go b/libnetwork/drivers/bridge/setup_ipv6_test.go
index 6fec16bd53..be8da291bc 100644
--- a/libnetwork/drivers/bridge/setup_ipv6_test.go
+++ b/libnetwork/drivers/bridge/setup_ipv6_test.go
@@ -53,7 +53,6 @@ func TestSetupIPv6(t *testing.T) {
 	if !found {
 		t.Fatalf("Bridge device does not have requested IPv6 address %v", bridgeIPv6)
 	}
-
 }
 
 func TestSetupGatewayIPv6(t *testing.T) {
diff --git a/libnetwork/drivers/macvlan/macvlan_store.go b/libnetwork/drivers/macvlan/macvlan_store.go
index 7dbc0d428e..89cad764b4 100644
--- a/libnetwork/drivers/macvlan/macvlan_store.go
+++ b/libnetwork/drivers/macvlan/macvlan_store.go
@@ -61,7 +61,6 @@ func (d *driver) initStore(option map[string]interface{}) error {
 		if err != nil {
 			return err
 		}
-
 	}
 
 	return nil
diff --git a/libnetwork/drivers/overlay/encryption.go b/libnetwork/drivers/overlay/encryption.go
index c5ab835cf3..a39e4faf40 100644
--- a/libnetwork/drivers/overlay/encryption.go
+++ b/libnetwork/drivers/overlay/encryption.go
@@ -10,11 +10,10 @@ import (
 	"fmt"
 	"hash/fnv"
 	"net"
+	"strconv"
 	"sync"
 	"syscall"
 
-	"strconv"
-
 	"github.com/docker/docker/libnetwork/drivers/overlay/overlayutils"
 	"github.com/docker/docker/libnetwork/iptables"
 	"github.com/docker/docker/libnetwork/ns"
@@ -76,7 +75,6 @@ func (e *encrMap) String() string {
 			b.WriteString(",")
 		}
 		b.WriteString("]")
-
 	}
 	return b.String()
 }
diff --git a/libnetwork/drivers/overlay/ov_network.go b/libnetwork/drivers/overlay/ov_network.go
index 305dd01c68..f611d11d89 100644
--- a/libnetwork/drivers/overlay/ov_network.go
+++ b/libnetwork/drivers/overlay/ov_network.go
@@ -561,7 +561,6 @@ func (n *network) restoreSubnetSandbox(s *subnet, brName, vxlanName string) erro
 }
 
 func (n *network) setupSubnetSandbox(s *subnet, brName, vxlanName string) error {
-
 	if hostMode {
 		// Try to delete stale bridge interface if it exists
 		if err := deleteInterface(brName); err != nil {
@@ -1076,7 +1075,7 @@ func (n *network) releaseVxlanID() ([]uint32, error) {
 }
 
 func (n *network) obtainVxlanID(s *subnet) error {
-	//return if the subnet already has a vxlan id assigned
+	// return if the subnet already has a vxlan id assigned
 	if n.vxlanID(s) != 0 {
 		return nil
 	}
diff --git a/libnetwork/drivers/overlay/ov_serf.go b/libnetwork/drivers/overlay/ov_serf.go
index 07b955227a..2b871184aa 100644
--- a/libnetwork/drivers/overlay/ov_serf.go
+++ b/libnetwork/drivers/overlay/ov_serf.go
@@ -179,9 +179,7 @@ func (d *driver) resolvePeer(nid string, peerIP net.IP) (net.HardwareAddr, net.I
 	}
 }
 
-func (d *driver) startSerfLoop(eventCh chan serf.Event, notifyCh chan ovNotify,
-	exitCh chan chan struct{}) {
-
+func (d *driver) startSerfLoop(eventCh chan serf.Event, notifyCh chan ovNotify, exitCh chan chan struct{}) {
 	for {
 		select {
 		case notify, ok := <-notifyCh:
diff --git a/libnetwork/drivers/overlay/ov_utils.go b/libnetwork/drivers/overlay/ov_utils.go
index c8acbc6b14..00e6c48e8f 100644
--- a/libnetwork/drivers/overlay/ov_utils.go
+++ b/libnetwork/drivers/overlay/ov_utils.go
@@ -106,7 +106,6 @@ func deleteInterfaceBySubnet(brPrefix string, s *subnet) error {
 		}
 	}
 	return nil
-
 }
 
 func deleteInterface(name string) error {
diff --git a/libnetwork/drivers/overlay/overlay.go b/libnetwork/drivers/overlay/overlay.go
index 50263c3d79..07084317b7 100644
--- a/libnetwork/drivers/overlay/overlay.go
+++ b/libnetwork/drivers/overlay/overlay.go
@@ -181,7 +181,6 @@ func Fini(drv driverapi.Driver) {
 }
 
 func (d *driver) configure() error {
-
 	// Apply OS specific kernel configs if needed
 	d.initOS.Do(applyOStweaks)
 
diff --git a/libnetwork/drivers/overlay/peerdb.go b/libnetwork/drivers/overlay/peerdb.go
index e812d3068c..303e8af4cb 100644
--- a/libnetwork/drivers/overlay/peerdb.go
+++ b/libnetwork/drivers/overlay/peerdb.go
@@ -168,9 +168,7 @@ func (d *driver) peerDbSearch(nid string, peerIP net.IP) (*peerKey, *peerEntry,
 	return pKeyMatched, pEntryMatched, nil
 }
 
-func (d *driver) peerDbAdd(nid, eid string, peerIP net.IP, peerIPMask net.IPMask,
-	peerMac net.HardwareAddr, vtep net.IP, isLocal bool) (bool, int) {
-
+func (d *driver) peerDbAdd(nid, eid string, peerIP net.IP, peerIPMask net.IPMask, peerMac net.HardwareAddr, vtep net.IP, isLocal bool) (bool, int) {
 	d.peerDb.Lock()
 	pMap, ok := d.peerDb.mp[nid]
 	if !ok {
@@ -205,9 +203,7 @@ func (d *driver) peerDbAdd(nid, eid string, peerIP net.IP, peerIPMask net.IPMask
 	return b, i
 }
 
-func (d *driver) peerDbDelete(nid, eid string, peerIP net.IP, peerIPMask net.IPMask,
-	peerMac net.HardwareAddr, vtep net.IP, isLocal bool) (bool, int) {
-
+func (d *driver) peerDbDelete(nid, eid string, peerIP net.IP, peerIPMask net.IPMask, peerMac net.HardwareAddr, vtep net.IP, isLocal bool) (bool, int) {
 	d.peerDb.Lock()
 	pMap, ok := d.peerDb.mp[nid]
 	if !ok {
@@ -340,9 +336,7 @@ func (d *driver) peerAdd(nid, eid string, peerIP net.IP, peerIPMask net.IPMask,
 	}
 }
 
-func (d *driver) peerAddOp(nid, eid string, peerIP net.IP, peerIPMask net.IPMask,
-	peerMac net.HardwareAddr, vtep net.IP, l2Miss, l3Miss, updateDB, localPeer bool) error {
-
+func (d *driver) peerAddOp(nid, eid string, peerIP net.IP, peerIPMask net.IPMask, peerMac net.HardwareAddr, vtep net.IP, l2Miss, l3Miss, updateDB, localPeer bool) error {
 	if err := validateID(nid, eid); err != nil {
 		return err
 	}
@@ -432,9 +426,7 @@ func (d *driver) peerDelete(nid, eid string, peerIP net.IP, peerIPMask net.IPMas
 	}
 }
 
-func (d *driver) peerDeleteOp(nid, eid string, peerIP net.IP, peerIPMask net.IPMask,
-	peerMac net.HardwareAddr, vtep net.IP, localPeer bool) error {
-
+func (d *driver) peerDeleteOp(nid, eid string, peerIP net.IP, peerIPMask net.IPMask, peerMac net.HardwareAddr, vtep net.IP, localPeer bool) error {
 	if err := validateID(nid, eid); err != nil {
 		return err
 	}
diff --git a/libnetwork/endpoint.go b/libnetwork/endpoint.go
index 4d732b66cc..bd77eb9813 100644
--- a/libnetwork/endpoint.go
+++ b/libnetwork/endpoint.go
@@ -178,7 +178,6 @@ func (ep *endpoint) UnmarshalJSON(b []byte) (err error) {
 				tplist = append(tplist, tp)
 			}
 			ep.generic[netlabel.ExposedPorts] = tplist
-
 		}
 	}
 
@@ -580,7 +579,6 @@ func (ep *endpoint) sbJoin(sb *sandbox, options ...EndpointOption) (err error) {
 					ep.Name(), ep.ID(), err)
 			}
 		}
-
 	}
 
 	if !sb.needDefaultGW() {
diff --git a/libnetwork/errors_test.go b/libnetwork/errors_test.go
index 195ad4e8f8..6e6c6c107c 100644
--- a/libnetwork/errors_test.go
+++ b/libnetwork/errors_test.go
@@ -7,7 +7,6 @@ import (
 )
 
 func TestErrorInterfaces(t *testing.T) {
-
 	badRequestErrorList := []error{ErrInvalidID(""), ErrInvalidName(""), ErrInvalidJoin{}, ErrInvalidNetworkDriver(""), InvalidContainerIDError(""), ErrNoSuchNetwork(""), ErrNoSuchEndpoint("")}
 	for _, err := range badRequestErrorList {
 		switch u := err.(type) {
@@ -47,5 +46,4 @@ func TestErrorInterfaces(t *testing.T) {
 			t.Fatalf("Failed to detect err %v is of type ForbiddenError. Got type: %T", err, u)
 		}
 	}
-
 }
diff --git a/libnetwork/etchosts/etchosts_test.go b/libnetwork/etchosts/etchosts_test.go
index 4b494d84d3..4a89d67246 100644
--- a/libnetwork/etchosts/etchosts_test.go
+++ b/libnetwork/etchosts/etchosts_test.go
@@ -209,7 +209,6 @@ func TestUpdateIgnoresPrefixedHostname(t *testing.T) {
 	if expected := "5.5.5.5\tprefix\n3.3.3.3\tprefixAndMore\n4.4.4.4\tunaffectedHost\n"; !bytes.Contains(content, []byte(expected)) {
 		t.Fatalf("Expected to find '%s' got '%s'", expected, content)
 	}
-
 }
 
 // This regression test covers the host prefix issue for the
diff --git a/libnetwork/ipam/allocator_test.go b/libnetwork/ipam/allocator_test.go
index 2c3150a636..a2bd0dc1af 100644
--- a/libnetwork/ipam/allocator_test.go
+++ b/libnetwork/ipam/allocator_test.go
@@ -1056,7 +1056,6 @@ func TestOverlappingRequests(t *testing.T) {
 }
 
 func TestUnusualSubnets(t *testing.T) {
-
 	subnet := "192.168.0.2/31"
 
 	outsideTheRangeAddresses := []struct {
@@ -1075,7 +1074,6 @@ func TestUnusualSubnets(t *testing.T) {
 	}
 
 	for _, store := range []bool{false, true} {
-
 		allocator, err := getAllocator(store)
 		if err != nil {
 			t.Fatal(err)
@@ -1117,7 +1115,6 @@ func TestUnusualSubnets(t *testing.T) {
 		if err != ipamapi.ErrNoAvailableIPs {
 			t.Fatal("Did not get expected error when pool is exhausted.")
 		}
-
 	}
 }
 
@@ -1264,7 +1261,6 @@ func benchmarkRequest(b *testing.B, a *Allocator, subnet string) {
 }
 
 func BenchmarkRequest(b *testing.B) {
-
 	subnets := []string{
 		"10.0.0.0/24",
 		"10.0.0.0/16",
diff --git a/libnetwork/ipams/null/null_test.go b/libnetwork/ipams/null/null_test.go
index d66e00853e..deb4bf3946 100644
--- a/libnetwork/ipams/null/null_test.go
+++ b/libnetwork/ipams/null/null_test.go
@@ -56,5 +56,4 @@ func TestOtherRequests(t *testing.T) {
 	if err == nil {
 		t.Fatal("Unexpected success")
 	}
-
 }
diff --git a/libnetwork/iptables/firewalld.go b/libnetwork/iptables/firewalld.go
index 3cc5422d4a..8674d78b30 100644
--- a/libnetwork/iptables/firewalld.go
+++ b/libnetwork/iptables/firewalld.go
@@ -206,7 +206,7 @@ func getDockerZoneSettings() []interface{} {
 		description: "zone for docker bridge network interfaces",
 		target:      "ACCEPT",
 	}
-	slice := []interface{}{
+	return []interface{}{
 		settings.version,
 		settings.name,
 		settings.description,
@@ -224,8 +224,6 @@ func getDockerZoneSettings() []interface{} {
 		settings.sourcePorts,
 		settings.icmpBlockInversion,
 	}
-	return slice
-
 }
 
 // setupDockerZone creates a zone called docker in firewalld which includes docker interfaces to allow
diff --git a/libnetwork/iptables/firewalld_test.go b/libnetwork/iptables/firewalld_test.go
index 1b47221196..9e4ef87195 100644
--- a/libnetwork/iptables/firewalld_test.go
+++ b/libnetwork/iptables/firewalld_test.go
@@ -90,5 +90,4 @@ func TestPassthrough(t *testing.T) {
 			t.Fatal("rule1 does not exist")
 		}
 	}
-
 }
diff --git a/libnetwork/iptables/iptables.go b/libnetwork/iptables/iptables.go
index 3fc70c9f6c..5a0783204b 100644
--- a/libnetwork/iptables/iptables.go
+++ b/libnetwork/iptables/iptables.go
@@ -260,7 +260,6 @@ func (iptable IPTable) ProgramChain(c *ChainInfo, bridgeName string, hairpinMode
 			} else if len(output) != 0 {
 				return fmt.Errorf("Could not delete linking rule from %s/%s: %s", c.Table, c.Name, output)
 			}
-
 		}
 		establish := []string{
 			"-o", bridgeName,
@@ -301,7 +300,6 @@ func (iptable IPTable) RemoveExistingChain(name string, table Table) error {
 
 // Forward adds forwarding rule to 'filter' table and corresponding nat rule to 'nat' table.
 func (c *ChainInfo) Forward(action Action, ip net.IP, port int, proto, destAddr string, destPort int, bridgeName string) error {
-
 	iptable := GetIptable(c.IPTable.Version)
 	daddr := ip.String()
 	if ip.IsUnspecified() {
diff --git a/libnetwork/libnetwork_internal_test.go b/libnetwork/libnetwork_internal_test.go
index e7f58998d4..83f626087a 100644
--- a/libnetwork/libnetwork_internal_test.go
+++ b/libnetwork/libnetwork_internal_test.go
@@ -334,7 +334,6 @@ func TestAuxAddresses(t *testing.T) {
 	}
 
 	for _, i := range input {
-
 		n.ipamV4Config = []*IpamConf{{PreferredPool: i.masterPool, SubPool: i.subPool, AuxAddresses: i.auxAddresses}}
 
 		err = n.ipamAllocate()
diff --git a/libnetwork/libnetwork_test.go b/libnetwork/libnetwork_test.go
index 5472547246..7f0cfe2471 100644
--- a/libnetwork/libnetwork_test.go
+++ b/libnetwork/libnetwork_test.go
@@ -400,7 +400,6 @@ func TestNetworkConfig(t *testing.T) {
 	if err := configNetwork.Delete(); err != nil {
 		t.Fatal(err)
 	}
-
 }
 
 func TestUnknownNetwork(t *testing.T) {
@@ -1054,7 +1053,6 @@ func TestEndpointMultipleJoins(t *testing.T) {
 	if _, ok := err.(types.ForbiddenError); !ok {
 		t.Fatalf("Failed with unexpected error type: %T. Desc: %s", err, err.Error())
 	}
-
 }
 
 func TestLeaveAll(t *testing.T) {
diff --git a/libnetwork/network.go b/libnetwork/network.go
index 94ca8d785b..f4c967100b 100644
--- a/libnetwork/network.go
+++ b/libnetwork/network.go
@@ -1168,7 +1168,6 @@ func (n *network) CreateEndpoint(name string, options ...EndpointOption) (Endpoi
 	defer n.ctrlr.networkLocker.Unlock(n.id) //nolint:errcheck
 
 	return n.createEndpoint(name, options...)
-
 }
 
 func (n *network) createEndpoint(name string, options ...EndpointOption) (Endpoint, error) {
@@ -1953,7 +1952,6 @@ func (n *network) TableEventRegister(tableName string, objType driverapi.ObjectT
 }
 
 func (n *network) UpdateIpamConfig(ipV4Data []driverapi.IPAMData) {
-
 	ipamV4Config := make([]*IpamConf, len(ipV4Data))
 
 	for i, data := range ipV4Data {
@@ -2233,7 +2231,6 @@ func (n *network) deleteLoadBalancerSandbox() error {
 	if err != nil {
 		logrus.Warnf("Failed to find load balancer endpoint %s on network %s: %v", endpointName, name, err)
 	} else {
-
 		info := endpoint.Info()
 		if info != nil {
 			sb := info.Sandbox()
diff --git a/libnetwork/networkdb/cluster.go b/libnetwork/networkdb/cluster.go
index 879ff522da..13afb41c42 100644
--- a/libnetwork/networkdb/cluster.go
+++ b/libnetwork/networkdb/cluster.go
@@ -200,7 +200,6 @@ func (nDB *NetworkDB) retryJoin(ctx context.Context, members []string) {
 			return
 		}
 	}
-
 }
 
 func (nDB *NetworkDB) clusterJoin(members []string) error {
diff --git a/libnetwork/osl/namespace_linux.go b/libnetwork/osl/namespace_linux.go
index e010dd2053..8103998e4d 100644
--- a/libnetwork/osl/namespace_linux.go
+++ b/libnetwork/osl/namespace_linux.go
@@ -177,7 +177,6 @@ func GenerateKey(containerID string) string {
 					index = tmpindex
 					tmpkey = id
 				}
-
 			}
 		}
 		containerID = tmpkey
diff --git a/libnetwork/osl/route_linux.go b/libnetwork/osl/route_linux.go
index c1cc543b2d..c2a6390956 100644
--- a/libnetwork/osl/route_linux.go
+++ b/libnetwork/osl/route_linux.go
@@ -183,7 +183,6 @@ func (n *networkNamespace) AddStaticRoute(r *types.StaticRoute) error {
 }
 
 func (n *networkNamespace) RemoveStaticRoute(r *types.StaticRoute) error {
-
 	err := n.removeRoute(n.nsPath(), r.Destination, r.NextHop)
 	if err == nil {
 		n.Lock()
diff --git a/libnetwork/osl/sandbox_linux_test.go b/libnetwork/osl/sandbox_linux_test.go
index aaf45a0a32..82b1932b0a 100644
--- a/libnetwork/osl/sandbox_linux_test.go
+++ b/libnetwork/osl/sandbox_linux_test.go
@@ -321,7 +321,6 @@ func TestSetInterfaceIP(t *testing.T) {
 }
 
 func TestLiveRestore(t *testing.T) {
-
 	defer testutils.SetupTestOSContext(t)()
 
 	key, err := newKey(t)
diff --git a/libnetwork/resolver.go b/libnetwork/resolver.go
index 9561ae397a..1c89397e96 100644
--- a/libnetwork/resolver.go
+++ b/libnetwork/resolver.go
@@ -347,7 +347,6 @@ func (r *resolver) handleSRVQuery(query *dns.Msg) (*dns.Msg, error) {
 		resp.Extra = append(resp.Extra, rr1)
 	}
 	return resp, nil
-
 }
 
 func truncateResp(resp *dns.Msg, maxSize int, isTCP bool) {
diff --git a/libnetwork/resolver_test.go b/libnetwork/resolver_test.go
index 6d8707fcfa..b2ba88914c 100644
--- a/libnetwork/resolver_test.go
+++ b/libnetwork/resolver_test.go
@@ -166,7 +166,6 @@ func TestDNSIPQuery(t *testing.T) {
 	t.Log("Response: ", resp.String())
 	checkDNSResponseCode(t, resp, dns.RcodeServerFailure)
 	w.ClearResponse()
-
 }
 
 func newDNSHandlerServFailOnce(requests *int) func(w dns.ResponseWriter, r *dns.Msg) {
diff --git a/libnetwork/sandbox.go b/libnetwork/sandbox.go
index 6ae21e27c5..6f5a2428ab 100644
--- a/libnetwork/sandbox.go
+++ b/libnetwork/sandbox.go
@@ -569,7 +569,6 @@ func (sb *sandbox) ResolveName(name string, ipType int) ([]net.IP, bool) {
 	}
 
 	for i := 0; i < len(reqName); i++ {
-
 		// First check for local container alias
 		ip, ipv6Miss := sb.resolveName(reqName[i], networkName[i], epList, true, ipType)
 		if ip != nil {
diff --git a/libnetwork/sandbox_dns_unix.go b/libnetwork/sandbox_dns_unix.go
index ae67ab08c8..13ab515782 100644
--- a/libnetwork/sandbox_dns_unix.go
+++ b/libnetwork/sandbox_dns_unix.go
@@ -209,9 +209,7 @@ func (sb *sandbox) setupDNS() error {
 
 	// When the user specify a conainter in the host namespace and do no have any dns option specified
 	// we just copy the host resolv.conf from the host itself
-	if sb.config.useDefaultSandBox &&
-		len(sb.config.dnsList) == 0 && len(sb.config.dnsSearchList) == 0 && len(sb.config.dnsOptionsList) == 0 {
-
+	if sb.config.useDefaultSandBox && len(sb.config.dnsList) == 0 && len(sb.config.dnsSearchList) == 0 && len(sb.config.dnsOptionsList) == 0 {
 		// We are working under the assumption that the origin file option had been properly expressed by the upper layer
 		// if not here we are going to error out
 		if err := copyFile(sb.config.originResolvConfPath, sb.config.resolvConfPath); err != nil {
@@ -325,7 +323,7 @@ func (sb *sandbox) updateDNS(ipv6Enabled bool) error {
 	if currHash != "" && currHash != currRC.Hash {
 		// Seems the user has changed the container resolv.conf since the last time
 		// we checked so return without doing anything.
-		//logrus.Infof("Skipping update of resolv.conf file with ipv6Enabled: %t because file was touched by user", ipv6Enabled)
+		// logrus.Infof("Skipping update of resolv.conf file with ipv6Enabled: %t because file was touched by user", ipv6Enabled)
 		return nil
 	}
 
diff --git a/libnetwork/service_common.go b/libnetwork/service_common.go
index 0b5281afc5..2b92405a0b 100644
--- a/libnetwork/service_common.go
+++ b/libnetwork/service_common.go
@@ -213,7 +213,6 @@ func (c *controller) cleanupServiceBindings(cleanupNID string) {
 	for _, f := range cleanupFuncs {
 		f()
 	}
-
 }
 
 func makeServiceCleanupFunc(c *controller, s *service, nID, eID string, vip net.IP, ip net.IP) func() {
@@ -315,7 +314,6 @@ func (c *controller) addServiceBinding(svcName, svcID, nID, eID, containerName s
 }
 
 func (c *controller) rmServiceBinding(svcName, svcID, nID, eID, containerName string, vip net.IP, ingressPorts []*PortConfig, serviceAliases []string, taskAliases []string, ip net.IP, method string, deleteSvcRecords bool, fullRemove bool) error {
-
 	var rmService bool
 
 	skey := serviceKey{
diff --git a/libnetwork/store.go b/libnetwork/store.go
index 66e4372c0f..34bd5d746c 100644
--- a/libnetwork/store.go
+++ b/libnetwork/store.go
@@ -319,7 +319,6 @@ func (c *controller) networkWatchLoop(nw *netWatch, ep *endpoint, ecCh <-chan da
 
 			for _, lEp := range delEpMap {
 				ep.getNetwork().updateSvcRecord(lEp, c.getLocalEps(nw), false)
-
 			}
 			for _, lEp := range addEp {
 				ep.getNetwork().updateSvcRecord(lEp, c.getLocalEps(nw), true)
diff --git a/libnetwork/store_linux_test.go b/libnetwork/store_linux_test.go
index b11a0fbb60..c02d8c8b55 100644
--- a/libnetwork/store_linux_test.go
+++ b/libnetwork/store_linux_test.go
@@ -14,7 +14,6 @@ func TestBoltdbBackend(t *testing.T) {
 	defer os.Remove("/tmp/boltdb.db")
 	config := &store.Config{Bucket: "testBackend"}
 	testLocalBackend(t, "boltdb", "/tmp/boltdb.db", config)
-
 }
 
 func TestNoPersist(t *testing.T) {