[IMP] Code cleaning.