Refactor according to the exercice needs