CB-6526 Clean up formatting and minor content