Refactor translation