Fix more formatting issues