Fixed some more formatting issues