Reduce PMD errors