[enh-fix] Cleaning code