Improve word-wrapping