Translator refactoring