Further CodeSniffer adaptions