Fixed pmd errors