handle some pmd warnings
Merging changes