PMD Warnings fixed.
(from 124 to 86)