fixed more checkstyle problems