Removed checkstyle and pmd issues