trav refactoring