Change OR criteria to not include AND criteria, style fixes