Fixed a few more formatting issues