Improve code quality of DbConnectors

Change-Id: I915ec58eeecd09f83dc1b5aa85121948c850442d