fix more checkstyle violations