Overhaul formatting.