Single responsibility in TSV class
Finished TSV refactoring