[#49067409] Refactor