Refactoring for TarsosDSP changes