[IMP]: improve code