Final formating changes