PMD : complexity refactoring
PMD : fix validator