More Checkstyles corrections