PMD Warnings fix