Minor refactor for clearer names
Adds and and or rules