clear some PMD violations