Refactor statuts