[#44386853] Code refactoring