more text refactors