Code sniffer cleanup