#24 PHPMD Fixes