Merging in formatting updates.