[IMP] Clean code