Clean up some PMD warnings