some checkstyle warnings fixed