minor cleanup using PMD