Fixing PHPCS violations
Merge https://github.com/aik099/qa-tools