Code Sniffer updates