Applying changes from PHPMD and PHPCS