Refactoring TRDClient