Refactoring sur le reporting