Some CodeSniffer changes