Refactor selection operators