Additional formatting fixes