Apply PHPCS fixes and some phpDoc improvements