More checkstyle changes....