[imp]:improve code