More changes to formatting