translation refactoring finished