MDLUM-3065: Coding style clean up