Refactoring made by Akram Ben Aissi