[IMP]: Improve code