MDL-41266 fix coding style issues