[imp]:improve code and string