fix more checkstyle warnings