Keeping PMD happy, a few classes at a time