More formating improvements.