Code sniffer cleanup.