CDB-1792 some coding style cleaning