Fixed most phpcs files
Merge remote-tracking branch 'origin/master'
Small changes looking for the error still.