[#49067409] refactor code
[#49067409] refactor code