TTS Refactoring