Updated PMD to the new version. Few minor code cleanups based on PMD violations.