More progress on formatting.