wip: tidy up selectors code
wip: tidy up selectors code

pact-foundation/pact-reference,pact-foundation/pact-reference,pact-foundation/pact-reference,pact-foundation/pact-reference,pact-foundation/pact-reference,pact-foundation/pact-reference,pact-foundation/pact-reference,pact-foundation/pact-reference