Text update and refactoring.