cleaning up the PMD warnings, nothing serious here