PMD warning fix (line count > 20)