Some more formatting fixes