corrected some varnings from pmd