Some more formating changes