[IMP]some code improvement