[IMP] Code improvement