PMD: Remove unused parameter
PMD: Fix short variable name and added $ds as excluded variable name