Clean up and use of DbClient
Fix typo