Many Checkstyles corrections