lots of PMD fixes
updating to use ConventLib