[imp] code improvement