[IMP] improving code