Fix more coding style issues