Fixed coding standard errors
Merge branch 'report-memory-improvements' into phpcs-fixer