cleared some of the PMD violations