Fix more formatting
Merge