PMD Warnings Fixed