MDL-24276 improved coding style