more and more checkstyle fixes