Added some more formating changes