fix some Checkstyle warnings