pmd fix
formatting and bug fix