Fix more style