[#44093583] Code refactoring