added WHERE1 clean structure