Refactoring to integrate directions