Cleaning
Importing work form Emmanuel Etasse