More formating changes