more checkstyle errors fixed