Got rid of all PMD errors