Refactor Director