diff --git a/cli/grpc.go b/cli/grpc.go
index 4e5843f87fe68bf2c5a011996db3ccf67933b0c9..098f09661e611d579c53ed5800650e61613f19e9 100644
--- a/cli/grpc.go
+++ b/cli/grpc.go
@@ -40,9 +40,9 @@ func GetIds(addr string) error {
 	if err != nil {
 		return err
 	}
-	for i,pnd := range resp.Pnd {
+	for i, pnd := range resp.Pnd {
 		log.Infof("PND %v: %v", i+1, pnd.Id)
-		for j,sbi := range pnd.Sbi {
+		for j, sbi := range pnd.Sbi {
 			log.Infof("\tSBI %v: %v", j+1, sbi.Id)
 		}
 	}
@@ -79,7 +79,7 @@ func AddDevice(addr, username, password, sbi, pnd, deviceAddress string) error {
 				},
 			},
 		},
-		Pid:           pnd,
+		Pid: pnd,
 	}
 	ctx := context.Background()
 	resp, err := pndClient.Set(ctx, req)
@@ -103,13 +103,13 @@ func GetDevice(addr, pid, path string, did ...string) error {
 
 	req := &ppb.GetRequest{
 		Timestamp: time.Now().UnixNano(),
-		Request:   &ppb.GetRequest_Ond{
+		Request: &ppb.GetRequest_Ond{
 			Ond: &ppb.GetOnd{
 				All: all,
 				Did: did,
 			},
 		},
-		Pid:       pid,
+		Pid: pid,
 	}
 	ctx := context.Background()
 	resp, err := pndClient.Get(ctx, req)
@@ -158,7 +158,7 @@ func sendChangeRequest(addr, pid string, req *ppb.ChangeRequest) error {
 	r := &ppb.SetRequest{
 		Timestamp:     time.Now().UnixNano(),
 		ChangeRequest: []*ppb.ChangeRequest{req},
-		Pid:            pid,
+		Pid:           pid,
 	}
 	resp, err := pndClient.Set(ctx, r)
 	if err != nil {
@@ -166,4 +166,4 @@ func sendChangeRequest(addr, pid string, req *ppb.ChangeRequest) error {
 	}
 	log.Info(resp.String())
 	return nil
-}
\ No newline at end of file
+}
diff --git a/northbound/client/core.go b/northbound/client/core.go
index 4a79fa8c91b39d2516ea81cde5767d38e15a9c60..cfe4ac9e55d65ee4dcc58ae0f0c6bea837f0164b 100644
--- a/northbound/client/core.go
+++ b/northbound/client/core.go
@@ -11,4 +11,4 @@ func CoreClient(addr string, opts ...grpc.DialOption) (pb.CoreClient, error) {
 		return nil, err
 	}
 	return pb.NewCoreClient(conn), nil
-}
\ No newline at end of file
+}
diff --git a/nucleus/southbound.go b/nucleus/southbound.go
index 6421a8f5395609c10bfb4abec8cbeb54ba368d97..cbf61d6c27257abbc6c4b0c9696e510b8874c9a6 100644
--- a/nucleus/southbound.go
+++ b/nucleus/southbound.go
@@ -163,4 +163,4 @@ func (oc *OpenConfig) ID() uuid.UUID {
 	return oc.id
 }
 
-func (oc *OpenConfig)Type() types.Southbound {return types.Openconfig}
\ No newline at end of file
+func (oc *OpenConfig) Type() types.Southbound { return types.Openconfig }