Minor DocBlock changes for PBC
Refactor for phpcs