[#59510076] Refactor