Reconciliator refactoring