Fix more formatting