FIX: PMD violations