Even more formatting issues