Code corrected with the PMD pluggin