Even more formatting fixes