Refactoring translations