Refactor

[#74763660]