more cleaning up of checkstyle warnings