PHP Codesniffer fixes

Simple start of fixes :)