Removing PMD warnings.
Removing checkstyle errors.