Fix some more formatting