Refactoring the Device Translator