Fixed some PMD complaints