Code clean up for style sniffer