TU refactoring