Fix some PHPCS issues
Merge pull request #1973 from wilsonge/morephpcs

Start fixing Jenkin's warnings