More checkstyle violation fixes