Fix: PHPMD issues
Fix: Suppress unfixable PHPMD warnings