Refactored Translator