Fix more checkstyle