[IMP]code improvment