Cleaned up for code_sniffer