diff --git a/db/kvstore/consulclient.go b/db/kvstore/consulclient.go
index 453f282..911da58 100644
--- a/db/kvstore/consulclient.go
+++ b/db/kvstore/consulclient.go
@@ -1,12 +1,12 @@
 package kvstore
 
 import (
+	"bytes"
 	"context"
 	"errors"
-	"bytes"
+	log "github.com/opencord/voltha-go/common/log"
 	"sync"
 	"time"
-	log "github.com/opencord/voltha-go/common/log"
 	//log "ciena.com/coordinator/common"
 	consulapi "github.com/hashicorp/consul/api"
 )
@@ -17,7 +17,6 @@
 	cancel  context.CancelFunc
 }
 
-
 // ConsulClient represents the consul KV store client
 type ConsulClient struct {
 	session                *consulapi.Session
@@ -140,7 +139,7 @@
 		session := c.consul.Session()
 		_, err := session.Destroy(c.sessionID, nil)
 		if err != nil {
-			log.Errorw("error-cleaning-session", log.Fields{"session":c.sessionID, "error":err})
+			log.Errorw("error-cleaning-session", log.Fields{"session": c.sessionID, "error": err})
 		}
 	}
 	c.sessionID = ""
@@ -157,12 +156,12 @@
 	for {
 		id, meta, err := session.Create(entry, nil)
 		if err != nil {
-			log.Errorw("create-session-error", log.Fields{"error":err})
+			log.Errorw("create-session-error", log.Fields{"error": err})
 			if retries == 0 {
 				return nil, "", err
 			}
 		} else if meta.RequestTime == 0 {
-			log.Errorw("create-session-bad-meta-data", log.Fields{"meta-data":meta})
+			log.Errorw("create-session-bad-meta-data", log.Fields{"meta-data": meta})
 			if retries == 0 {
 				return nil, "", errors.New("bad-meta-data")
 			}
@@ -183,7 +182,6 @@
 	}
 }
 
-
 // Helper function to verify mostly whether the content of two interface types are the same.  Focus is []byte and
 // string types
 func isEqual(val1 interface{}, val2 interface{}) bool {
@@ -226,10 +224,10 @@
 
 	session, sessionID, err := c.createSession(ttl, -1)
 	if err != nil {
-		log.Errorw("no-session-created", log.Fields{"error":err})
+		log.Errorw("no-session-created", log.Fields{"error": err})
 		return "", errors.New("no-session-created")
 	}
-	log.Debugw("session-created", log.Fields{"session-id":sessionID})
+	log.Debugw("session-created", log.Fields{"session-id": sessionID})
 	c.sessionID = sessionID
 	c.session = session
 
@@ -238,11 +236,11 @@
 	kvp := consulapi.KVPair{Key: key, Value: val, Session: c.sessionID}
 	result, _, err := kv.Acquire(&kvp, nil)
 	if err != nil {
-		log.Errorw("error-acquiring-keys", log.Fields{"error":err})
+		log.Errorw("error-acquiring-keys", log.Fields{"error": err})
 		return nil, err
 	}
 
-	log.Debugw("key-acquired", log.Fields{"key":key, "status":result})
+	log.Debugw("key-acquired", log.Fields{"key": key, "status": result})
 
 	// Irrespective whether we were successful in acquiring the key, let's read it back and see if it's us.
 	m, err := c.Get(key, defaultKVGetTimeout)
@@ -250,7 +248,7 @@
 		return nil, err
 	}
 	if m != nil {
-		log.Debugw("response-received", log.Fields{"key":m.Key, "m.value":string(m.Value.([]byte)), "value":value})
+		log.Debugw("response-received", log.Fields{"key": m.Key, "m.value": string(m.Value.([]byte)), "value": value})
 		if m.Key == key && isEqual(m.Value, value) {
 			// My reservation is successful - register it.  For now, support is only for 1 reservation per key
 			// per session.
@@ -280,11 +278,11 @@
 		kvp = consulapi.KVPair{Key: key, Value: value.([]byte), Session: c.sessionID}
 		result, _, err = kv.Release(&kvp, nil)
 		if err != nil {
-			log.Errorw("cannot-release-reservation", log.Fields{"key":key, "error":err})
+			log.Errorw("cannot-release-reservation", log.Fields{"key": key, "error": err})
 			return err
 		}
 		if !result {
-			log.Errorw("cannot-release-reservation", log.Fields{"key":key})
+			log.Errorw("cannot-release-reservation", log.Fields{"key": key})
 		}
 		delete(c.keyReservations, key)
 	}
@@ -371,7 +369,7 @@
 	c.writeLock.Lock()
 	defer c.writeLock.Unlock()
 	if watchedChannelsContexts, ok = c.watchedChannelsContext[key]; !ok {
-		log.Errorw("key-has-no-watched-context-or-channel", log.Fields{"key":key})
+		log.Errorw("key-has-no-watched-context-or-channel", log.Fields{"key": key})
 		return
 	}
 	// Look for the channels
@@ -390,7 +388,7 @@
 	if pos >= 0 {
 		c.watchedChannelsContext[key] = append(c.watchedChannelsContext[key][:pos], c.watchedChannelsContext[key][pos+1:]...)
 	}
-	log.Debugw("watched-channel-exiting", log.Fields{"key":key, "channel":c.watchedChannelsContext[key]})
+	log.Debugw("watched-channel-exiting", log.Fields{"key": key, "channel": c.watchedChannelsContext[key]})
 }
 
 func (c *ConsulClient) isKVEqual(kv1 *consulapi.KVPair, kv2 *consulapi.KVPair) bool {
@@ -411,7 +409,7 @@
 }
 
 func (c *ConsulClient) listenForKeyChange(watchContext context.Context, key string, ch chan *Event) {
-	log.Debugw("start-watching-channel", log.Fields{"key":key, "channel":ch})
+	log.Debugw("start-watching-channel", log.Fields{"key": key, "channel": ch})
 
 	defer c.CloseWatch(key, ch)
 	duration := GetDuration(defaultKVGetTimeout)
@@ -441,10 +439,10 @@
 			return
 		default:
 			if err != nil {
-				log.Warnw("error-from-watch", log.Fields{"error":err})
+				log.Warnw("error-from-watch", log.Fields{"error": err})
 				ch <- NewEvent(CONNECTIONDOWN, key, []byte(""))
 			} else {
-				log.Debugw("index-state", log.Fields{"lastindex":lastIndex, "newindex":meta.LastIndex, "key":key})
+				log.Debugw("index-state", log.Fields{"lastindex": lastIndex, "newindex": meta.LastIndex, "key": key})
 			}
 		}
 		if err != nil {
@@ -454,13 +452,13 @@
 		} else if meta.LastIndex <= lastIndex {
 			log.Info("no-index-change-or-negative")
 		} else {
-			log.Debugw("update-received", log.Fields{"pair":pair})
+			log.Debugw("update-received", log.Fields{"pair": pair})
 			if pair == nil {
 				ch <- NewEvent(DELETE, key, []byte(""))
 			} else if !c.isKVEqual(pair, previousKVPair) {
 				// Push the change onto the channel if the data has changed
 				// For now just assume it's a PUT change
-				log.Debugw("pair-details", log.Fields{"session":pair.Session, "key":pair.Key, "value":pair.Value})
+				log.Debugw("pair-details", log.Fields{"session": pair.Session, "key": pair.Key, "value": pair.Value})
 				ch <- NewEvent(PUT, pair.Key, pair.Value)
 			}
 			previousKVPair = pair
@@ -481,6 +479,6 @@
 
 	// Clear the sessionID
 	if _, err := c.consul.Session().Destroy(c.sessionID, &writeOptions); err != nil {
-		log.Errorw("error-closing-client", log.Fields{"error":err})
+		log.Errorw("error-closing-client", log.Fields{"error": err})
 	}
 }
diff --git a/db/kvstore/etcdclient.go b/db/kvstore/etcdclient.go
index 2755cd1..becc86b 100644
--- a/db/kvstore/etcdclient.go
+++ b/db/kvstore/etcdclient.go
@@ -4,11 +4,11 @@
 	//log "../common"
 	"context"
 	"errors"
-	"sync"
-	log "github.com/opencord/voltha-go/common/log"
 	"fmt"
 	v3Client "github.com/coreos/etcd/clientv3"
 	v3rpcTypes "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
+	log "github.com/opencord/voltha-go/common/log"
+	"sync"
 )
 
 // EtcdClient represents the Etcd KV store client
@@ -98,13 +98,13 @@
 	if err != nil {
 		switch err {
 		case context.Canceled:
-			log.Warnw("context-cancelled", log.Fields{"error":err})
+			log.Warnw("context-cancelled", log.Fields{"error": err})
 		case context.DeadlineExceeded:
-			log.Warnw("context-deadline-exceeded", log.Fields{"error":err})
+			log.Warnw("context-deadline-exceeded", log.Fields{"error": err})
 		case v3rpcTypes.ErrEmptyKey:
-			log.Warnw("etcd-client-error", log.Fields{"error":err})
+			log.Warnw("etcd-client-error", log.Fields{"error": err})
 		default:
-			log.Warnw("bad-endpoints", log.Fields{"error":err})
+			log.Warnw("bad-endpoints", log.Fields{"error": err})
 		}
 		return err
 	}
@@ -142,7 +142,7 @@
 		return nil
 	}
 
-	log.Debugw("delete-keys", log.Fields{"all-keys-deleted":int64(len(gresp.Kvs)) == dresp.Deleted})
+	log.Debugw("delete-keys", log.Fields{"all-keys-deleted": int64(len(gresp.Kvs)) == dresp.Deleted})
 	if int64(len(gresp.Kvs)) == dresp.Deleted {
 		log.Debug("All-keys-deleted")
 	} else {
@@ -236,7 +236,7 @@
 	for key, leaseID := range c.keyReservations {
 		_, err := c.ectdAPI.Revoke(context.Background(), *leaseID)
 		if err != nil {
-			log.Errorw("cannot-release-reservation", log.Fields{"key":key, "error":err})
+			log.Errorw("cannot-release-reservation", log.Fields{"key": key, "error": err})
 			return err
 		}
 		delete(c.keyReservations, key)
@@ -280,7 +280,7 @@
 	if leaseID != nil {
 		_, err := c.ectdAPI.KeepAliveOnce(context.Background(), *leaseID)
 		if err != nil {
-			log.Errorw("lease-may-have-expired", log.Fields{"error":err})
+			log.Errorw("lease-may-have-expired", log.Fields{"error": err})
 			return err
 		}
 	} else {
@@ -305,7 +305,7 @@
 	//defer c.writeLock.Unlock()
 	c.watchedChannels[key] = append(c.watchedChannels[key], channelMap)
 
-	log.Debugw("watched-channels", log.Fields{"channels":c.watchedChannels[key]})
+	log.Debugw("watched-channels", log.Fields{"channels": c.watchedChannels[key]})
 	// Launch a go routine to listen for updates
 	go c.listenForKeyChange(channel, ch)
 
@@ -323,7 +323,7 @@
 	defer c.writeLock.Unlock()
 
 	if watchedChannels, ok = c.watchedChannels[key]; !ok {
-		log.Warnw("key-has-no-watched-channels", log.Fields{"key":key})
+		log.Warnw("key-has-no-watched-channels", log.Fields{"key": key})
 		return
 	}
 	// Look for the channels
@@ -333,7 +333,7 @@
 			log.Debug("channel-found")
 			// Close the etcd watcher before the client channel.  This should close the etcd channel as well
 			if err := t.Close(); err != nil {
-				log.Errorw("watcher-cannot-be-closed", log.Fields{"key":key, "error":err})
+				log.Errorw("watcher-cannot-be-closed", log.Fields{"key": key, "error": err})
 			}
 			close(ch)
 			pos = i
@@ -344,11 +344,11 @@
 	if pos >= 0 {
 		c.watchedChannels[key] = append(c.watchedChannels[key][:pos], c.watchedChannels[key][pos+1:]...)
 	}
-	log.Infow("watcher-channel-exiting", log.Fields{"key":key, "channel":c.watchedChannels[key]})
+	log.Infow("watcher-channel-exiting", log.Fields{"key": key, "channel": c.watchedChannels[key]})
 }
 
 func (c *EtcdClient) listenForKeyChange(channel v3Client.WatchChan, ch chan<- *Event) {
-	log.Infow("start-listening-on-channel", log.Fields{"channel":ch})
+	log.Infow("start-listening-on-channel", log.Fields{"channel": ch})
 	for resp := range channel {
 		for _, ev := range resp.Events {
 			//log.Debugf("%s %q : %q\n", ev.Type, ev.Kv.Key, ev.Kv.Value)
@@ -373,6 +373,6 @@
 	c.writeLock.Lock()
 	defer c.writeLock.Unlock()
 	if err := c.ectdAPI.Close(); err != nil {
-		log.Errorw("error-closing-client", log.Fields{"error":err})
+		log.Errorw("error-closing-client", log.Fields{"error": err})
 	}
 }
diff --git a/db/kvstore/kvutils_test.go b/db/kvstore/kvutils_test.go
index f5e82d2..2f3818d 100644
--- a/db/kvstore/kvutils_test.go
+++ b/db/kvstore/kvutils_test.go
@@ -1,9 +1,9 @@
 package kvstore
 
 import (
-	"time"
-	"testing"
 	"github.com/stretchr/testify/assert"
+	"testing"
+	"time"
 )
 
 func TestDurationWithNegativeTimeout(t *testing.T) {