[#84559032] refator code