Refactoring dali