#67: Refactoring some things in PairingService that I missed in the last issue.
#67: Refactoring some things in PairingService that I missed in the last issue.

sten626/mirror-match,sten626/mirror-match,sten626/mirror-match