[#43150161] Code refatoring