more text refactoring