Fixed up some more formatting