Remediating some PHPCS issues. Batch 1.

Merge request reports

Loading