PMD Static Analysis Corrections