translation refactor