[IMP] imporve code