Yet more formatting fixes