diff --git a/rw_core/core/device_manager.go b/rw_core/core/device_manager.go
index 34fc956..e50c035 100644
--- a/rw_core/core/device_manager.go
+++ b/rw_core/core/device_manager.go
@@ -38,7 +38,7 @@
 	kafkaICProxy        *kafka.InterContainerProxy
 	stateTransitions    *TransitionMap
 	clusterDataProxy    *model.Proxy
-	coreInstanceId string
+	coreInstanceId      string
 	exitChannel         chan int
 	lockDeviceAgentsMap sync.RWMutex
 }
diff --git a/rw_core/core/grpc_nbi_api_handler.go b/rw_core/core/grpc_nbi_api_handler.go
index 79ef982..9b7fac7 100644
--- a/rw_core/core/grpc_nbi_api_handler.go
+++ b/rw_core/core/grpc_nbi_api_handler.go
@@ -37,7 +37,7 @@
 type APIHandler struct {
 	deviceMgr        *DeviceManager
 	logicalDeviceMgr *LogicalDeviceManager
-	packetInQueue     *queue.Queue
+	packetInQueue    *queue.Queue
 	da.DefaultAPIHandler
 }
 
@@ -46,7 +46,7 @@
 		deviceMgr:        deviceMgr,
 		logicalDeviceMgr: lDeviceMgr,
 		// TODO: Figure out what the 'hint' parameter to queue.New does
-		packetInQueue:    queue.New(10),
+		packetInQueue: queue.New(10),
 	}
 	return handler
 }
diff --git a/rw_core/main.go b/rw_core/main.go
index dbb82b0..dd830c1 100644
--- a/rw_core/main.go
+++ b/rw_core/main.go
@@ -219,7 +219,7 @@
 	}
 
 	log.SetPackageLogLevel("github.com/opencord/voltha-go/rw_core/core", log.DebugLevel)
-	log.SetPackageLogLevel("github.com/opencord/voltha-go/kafka", log.DebugLevel)
+	//log.SetPackageLogLevel("github.com/opencord/voltha-go/kafka", log.DebugLevel)
 
 	defer log.CleanUp()