Small fixes to line wrapping and style.