Improved performance with wrapped text
minor edits