Code improvement and harmonization in the light of db.nomics changes in terms of variable types and names.