pmd warnings removed.