Refactoring T7