CodeSniffer fixes