Refactoring and translation