Refactor for a more readable code : Step1 ok (editor)