Updating formatting and wrapping