Update wrapping and clean-up whitespace.