Fix code formatting again
Fix more formatting issues