Refactoring of DA