TripleGenerator refactoring