fixed some more checkstyle warnings for #42