code and naming refinement with PMD validation