[#49067409] refactor code