Some PMD cleanup
Some PMD issues removed, minor cleanup