Fixed some pmd issues