Options based where statements refactor