[IMP] Improve code