[IMP] Code cleaning