And a tidier text handler