String factoring + names improvement
Cleaning.