code sniff cleanup