#24 Fixes PHPCS
#24 Fixes PHPMD
#24 Fixes PHPUnit