#24 PHPCS Fixes
#24 PHPMD Fixes