More checkstyle adjustments