TriX refactor