[IMP] Code impovement