Codesniffer fixes