more PHPdoc and phpcs compliance