Refactoring translation