Making ot complient with sniffer

Some spaces and OR and AND s