refactor qui marche