text change and refactoring