Fix more code style