diff --git a/database/common.go b/database/common.go
index 6d7b4a7..6b5117c 100644
--- a/database/common.go
+++ b/database/common.go
@@ -29,8 +29,8 @@
 	PreviousVersion = "v1"
 )
 
-//These are present path where different database elements are store in database
-//In case any of these paths change, update the present and previous version
+// These are present path where different database elements are store in database
+// In case any of these paths change, update the present and previous version
 const (
 	BasePath               string = "service/vgc/%s/"
 	ServicePath            string = "services/"
@@ -67,7 +67,7 @@
 	DeviceConfigPath       string = "device-config/"
 )
 
-//PresentVersionMap - map of present version for all database tables
+// PresentVersionMap - map of present version for all database tables
 var PresentVersionMap = map[string]string{
 	ServicePath:            "v3",
 	DevicePath:             "v1",
@@ -103,7 +103,7 @@
 	DeviceConfigPath:       "v1",
 }
 
-//PreviousVersionMap - map of previous version for all database tables
+// PreviousVersionMap - map of previous version for all database tables
 var PreviousVersionMap = map[string]string{
 	ServicePath:            "v2",
 	DevicePath:             "v1",
@@ -139,7 +139,7 @@
 	DeviceConfigPath:       "v1",
 }
 
-//DBVersionMap - Version of tables present in DB
+// DBVersionMap - Version of tables present in DB
 var DBVersionMap = PreviousVersionMap
 
 // GetModuleKeypath returns the DB keypath for particular module along with version
diff --git a/database/database.go b/database/database.go
index 63125f6..44c37a5 100644
--- a/database/database.go
+++ b/database/database.go
@@ -38,10 +38,10 @@
 
 // Database structure
 type Database struct {
+	kvc       kvstore.Client
 	storeType string
 	address   string
 	//timeout   uint32
-	kvc kvstore.Client
 }
 
 // Initialize the database module. The database module runs as a singleton
@@ -931,7 +931,6 @@
 		return false
 	}
 	return true
-
 }
 
 // PutFlowHash to add flowhash for the device
diff --git a/database/dbintf.go b/database/dbintf.go
index 6100d35..f4b6b98 100644
--- a/database/dbintf.go
+++ b/database/dbintf.go
@@ -160,12 +160,12 @@
 	GetOltFlowService(ctx context.Context) (string, error)
 }
 
-//GetDatabase - returns databse operation based on configuration
+// GetDatabase - returns databse operation based on configuration
 func GetDatabase() DBIntf {
 	return dbObj
 }
 
-//SetDatabase - sets the DB object based on the type
+// SetDatabase - sets the DB object based on the type
 func SetDatabase(df DBIntf) {
 	dbObj = df
 }