Checkstyle and pmd errors fixed.