[IMP] Improvement in code