This commit cleans up line breaks, and fixes some of the styling
introduced earlier in this merge request.