yincart-refactoring