TSVWriter renamed and cleaned