code sniff improvements