[translate]: More refactoring