Small Translate refactoring