Tidying Up the Translator