[#93745] Refactor code